Fix warnings.

[openssl.git] / apps / s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index eaa9269610e0c8bbd4c06eb5f5681282f73ed611..59a4daa98a263a0c4a7006038f3ff0c2a6d1a329 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 /* ====================================================================
  * [including the GNU Public Licence.]
  */
 /* ====================================================================

- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -108,8 +108,35 @@
  * Hudson (tjh@cryptsoft.com).
  *
  */
  * Hudson (tjh@cryptsoft.com).
  *
  */

+/* ====================================================================
+ * Copyright 2005 Nokia. All rights reserved.
+ *
+ * The portions of the attached software ("Contribution") is developed by
+ * Nokia Corporation and is licensed pursuant to the OpenSSL open source
+ * license.
+ *
+ * The Contribution, originally written by Mika Kousa and Pasi Eronen of
+ * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
+ * support (see RFC 4279) to OpenSSL.
+ *
+ * No patent licenses or other rights except those expressly stated in
+ * the OpenSSL open source license shall be deemed granted or received
+ * expressly, by implication, estoppel, or otherwise.
+ *
+ * No assurances are provided by Nokia that the Contribution does not
+ * infringe the patent or other intellectual property rights of any third
+ * party or that the license provides you with all the necessary rights
+ * to make use of the Contribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
+ * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
+ * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
+ * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
+ * OTHERWISE.
+ */

 
 #include <assert.h>
 
 #include <assert.h>

+#include <ctype.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -137,20 +164,15 @@ typedef unsigned int u_int;
 #include "s_apps.h"
 #include "timeouts.h"
 
 #include "s_apps.h"
 #include "timeouts.h"
 

-#ifdef OPENSSL_SYS_WINCE
-/* Windows CE incorrectly defines fileno as returning void*, so to avoid problems below... */
-#ifdef fileno
-#undef fileno
-#endif
-#define fileno(a) (int)_fileno(a)
-#endif
-
-

 #if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
 /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
 
 #if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
 /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
 

+#if defined(OPENSSL_SYS_BEOS_R5)
+#include <fcntl.h>
+#endif
+

 #undef PROG
 #define PROG   s_client_main
 
 #undef PROG
 #define PROG   s_client_main
 


@@ -165,12 +187,16 @@ typedef unsigned int u_int;
 
 extern int verify_depth;
 extern int verify_error;
 
 extern int verify_depth;
 extern int verify_error;

+extern int verify_return_error;

 
 #ifdef FIONBIO
 static int c_nbio=0;
 #endif
 static int c_Pause=0;
 static int c_debug=0;
 
 #ifdef FIONBIO
 static int c_nbio=0;
 #endif
 static int c_Pause=0;
 static int c_debug=0;

+#ifndef OPENSSL_NO_TLSEXT
+static int c_tlsextdebug=0;
+#endif

 static int c_msg=0;
 static int c_showcerts=0;
 
 static int c_msg=0;
 static int c_showcerts=0;
 


@@ -180,6 +206,69 @@ static BIO *bio_c_out=NULL;
 static int c_quiet=0;
 static int c_ign_eof=0;
 
 static int c_quiet=0;
 static int c_ign_eof=0;
 

+#ifndef OPENSSL_NO_PSK
+/* Default PSK identity and key */
+static char *psk_identity="Client_identity";
+static char *psk_key=NULL; /* by default PSK is not used */
+
+static unsigned int psk_client_cb(SSL *ssl, const char *hint, char *identity,
+       unsigned int max_identity_len, unsigned char *psk,
+       unsigned int max_psk_len)
+       {
+       unsigned int psk_len = 0;
+       int ret;
+        BIGNUM *bn=NULL;
+
+       if (c_debug)
+               BIO_printf(bio_c_out, "psk_client_cb\n");
+       if (!hint)
+                {
+                /* no ServerKeyExchange message*/
+               if (c_debug)
+                       BIO_printf(bio_c_out,"NULL received PSK identity hint, continuing anyway\n");
+                }
+        else if (c_debug)
+               BIO_printf(bio_c_out, "Received PSK identity hint '%s'\n", hint);
+
+       /* lookup PSK identity and PSK key based on the given identity hint here */
+       ret = BIO_snprintf(identity, max_identity_len, psk_identity);
+       if (ret < 0 || (unsigned int)ret > max_identity_len)
+               goto out_err;
+       if (c_debug)
+               BIO_printf(bio_c_out, "created identity '%s' len=%d\n", identity, ret);
+        ret=BN_hex2bn(&bn, psk_key);
+        if (!ret)
+                {
+                BIO_printf(bio_err,"Could not convert PSK key '%s' to BIGNUM\n", psk_key);
+                if (bn)
+                        BN_free(bn);
+                return 0;
+                }
+
+        if ((unsigned int)BN_num_bytes(bn) > max_psk_len)
+                {
+                BIO_printf(bio_err,"psk buffer of callback is too small (%d) for key (%d)\n",
+                        max_psk_len, BN_num_bytes(bn));
+                BN_free(bn);
+                return 0;
+                }
+
+        psk_len=BN_bn2bin(bn, psk);
+        BN_free(bn);
+        if (psk_len == 0)
+                goto out_err;
+
+       if (c_debug)
+               BIO_printf(bio_c_out, "created PSK len=%d\n", psk_len);
+
+        return psk_len;
+ out_err:
+       if (c_debug)
+               BIO_printf(bio_err, "Error in PSK client callback\n");
+        return 0;
+       }
+#endif
+

 static void sc_usage(void)
        {
        BIO_printf(bio_err,"usage: s_client args\n");
 static void sc_usage(void)
        {
        BIO_printf(bio_err,"usage: s_client args\n");


@@ -213,6 +302,10 @@ static void sc_usage(void)
        BIO_printf(bio_err," -crlf         - convert LF from terminal into CRLF\n");
        BIO_printf(bio_err," -quiet        - no s_client output\n");
        BIO_printf(bio_err," -ign_eof      - ignore input eof (default when -quiet)\n");
        BIO_printf(bio_err," -crlf         - convert LF from terminal into CRLF\n");
        BIO_printf(bio_err," -quiet        - no s_client output\n");
        BIO_printf(bio_err," -ign_eof      - ignore input eof (default when -quiet)\n");

+#ifndef OPENSSL_NO_PSK
+       BIO_printf(bio_err," -psk_identity arg - PSK identity\n");
+       BIO_printf(bio_err," -psk arg      - PSK in hex (without 0x)\n");
+#endif

        BIO_printf(bio_err," -ssl2         - just use SSLv2\n");
        BIO_printf(bio_err," -ssl3         - just use SSLv3\n");
        BIO_printf(bio_err," -tls1         - just use TLSv1\n");
        BIO_printf(bio_err," -ssl2         - just use SSLv2\n");
        BIO_printf(bio_err," -ssl3         - just use SSLv3\n");
        BIO_printf(bio_err," -tls1         - just use TLSv1\n");


@@ -226,20 +319,53 @@ static void sc_usage(void)
        BIO_printf(bio_err," -starttls prot - use the STARTTLS command before starting TLS\n");
        BIO_printf(bio_err,"                 for those protocols that support it, where\n");
        BIO_printf(bio_err,"                 'prot' defines which one to assume.  Currently,\n");
        BIO_printf(bio_err," -starttls prot - use the STARTTLS command before starting TLS\n");
        BIO_printf(bio_err,"                 for those protocols that support it, where\n");
        BIO_printf(bio_err,"                 'prot' defines which one to assume.  Currently,\n");

-       BIO_printf(bio_err,"                 only \"smtp\" and \"pop3\" are supported.\n");
+       BIO_printf(bio_err,"                 only \"smtp\", \"pop3\", \"imap\", and \"ftp\" are supported.\n");

 #ifndef OPENSSL_NO_ENGINE
        BIO_printf(bio_err," -engine id    - Initialise and use the specified engine\n");
 #endif
        BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 #ifndef OPENSSL_NO_ENGINE
        BIO_printf(bio_err," -engine id    - Initialise and use the specified engine\n");
 #endif
        BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);

+#ifndef OPENSSL_NO_TLSEXT
+       BIO_printf(bio_err," -servername host  - Set TLS extension servername in ClientHello\n");
+#endif
+       }
+
+#ifndef OPENSSL_NO_TLSEXT
+
+/* This is a context that we pass to callbacks */
+typedef struct tlsextctx_st {
+   BIO * biodebug;
+   int ack;
+} tlsextctx;

 
 

+
+static int MS_CALLBACK ssl_servername_cb(SSL *s, int *ad, void *arg)
+       {
+       tlsextctx * p = (tlsextctx *) arg;
+       const char * hn= SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
+       if (SSL_get_servername_type(s) != -1) 
+               p->ack = !SSL_session_reused(s) && hn != NULL;
+       else 
+               BIO_printf(bio_err,"Can't use SSL_get_servername\n");
+       
+       return SSL_TLSEXT_ERR_OK;

        }
        }

+#endif
+
+enum
+{
+       PROTO_OFF       = 0,
+       PROTO_SMTP,
+       PROTO_POP3,
+       PROTO_IMAP,
+       PROTO_FTP
+};

 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
        int off=0;
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
        int off=0;

-       SSL *con=NULL,*con2=NULL;
+       SSL *con=NULL;

        X509_STORE *store = NULL;
        int s,k,width,state=0;
        char *cbuf=NULL,*sbuf=NULL,*mbuf=NULL;
        X509_STORE *store = NULL;
        int s,k,width,state=0;
        char *cbuf=NULL,*sbuf=NULL,*mbuf=NULL;


@@ -260,24 +386,35 @@ int MAIN(int argc, char **argv)
        int write_tty,read_tty,write_ssl,read_ssl,tty_on,ssl_pending;
        SSL_CTX *ctx=NULL;
        int ret=1,in_init=1,i,nbio_test=0;
        int write_tty,read_tty,write_ssl,read_ssl,tty_on,ssl_pending;
        SSL_CTX *ctx=NULL;
        int ret=1,in_init=1,i,nbio_test=0;

-       int starttls_proto = 0;
+       int starttls_proto = PROTO_OFF;

        int prexit = 0, vflags = 0;
        int prexit = 0, vflags = 0;

-       SSL_METHOD *meth=NULL;
-       int sock_type=SOCK_STREAM;
+       const SSL_METHOD *meth=NULL;
+       int socket_type=SOCK_STREAM;

        BIO *sbio;
        char *inrand=NULL;
        BIO *sbio;
        char *inrand=NULL;

+       int mbuf_len=0;

 #ifndef OPENSSL_NO_ENGINE
        char *engine_id=NULL;
        ENGINE *e=NULL;
 #endif
 #ifndef OPENSSL_NO_ENGINE
        char *engine_id=NULL;
        ENGINE *e=NULL;
 #endif

-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)

        struct timeval tv;
        struct timeval tv;

+#if defined(OPENSSL_SYS_BEOS_R5)
+       int stdin_set = 0;
+#endif

 #endif
 
 #endif
 

+#ifndef OPENSSL_NO_TLSEXT
+       char *servername = NULL; 
+        tlsextctx tlsextcbp = 
+        {NULL,0};
+#endif
+       char *sess_in = NULL;
+       char *sess_out = NULL;

        struct sockaddr peer;
        int peerlen = sizeof(peer);
        int enable_timeouts = 0 ;
        struct sockaddr peer;
        int peerlen = sizeof(peer);
        int enable_timeouts = 0 ;

-       long mtu = 0;
+       long socket_mtu = 0;

 
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
        meth=SSLv23_client_method();
 
 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
        meth=SSLv23_client_method();


@@ -348,6 +485,16 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        cert_file= *(++argv);
                        }
                        if (--argc < 1) goto bad;
                        cert_file= *(++argv);
                        }

+               else if (strcmp(*argv,"-sess_out") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       sess_out = *(++argv);
+                       }
+               else if (strcmp(*argv,"-sess_in") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       sess_in = *(++argv);
+                       }

                else if (strcmp(*argv,"-certform") == 0)
                        {
                        if (--argc < 1) goto bad;
                else if (strcmp(*argv,"-certform") == 0)
                        {
                        if (--argc < 1) goto bad;


@@ -357,6 +504,8 @@ int MAIN(int argc, char **argv)
                        vflags |= X509_V_FLAG_CRL_CHECK;
                else if (strcmp(*argv,"-crl_check_all") == 0)
                        vflags |= X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL;
                        vflags |= X509_V_FLAG_CRL_CHECK;
                else if (strcmp(*argv,"-crl_check_all") == 0)
                        vflags |= X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL;

+               else if (strcmp(*argv,"-verify_return_error") == 0)
+                       verify_return_error = 1;

                else if (strcmp(*argv,"-prexit") == 0)
                        prexit=1;
                else if (strcmp(*argv,"-crlf") == 0)
                else if (strcmp(*argv,"-prexit") == 0)
                        prexit=1;
                else if (strcmp(*argv,"-crlf") == 0)


@@ -372,6 +521,10 @@ int MAIN(int argc, char **argv)
                        c_Pause=1;
                else if (strcmp(*argv,"-debug") == 0)
                        c_debug=1;
                        c_Pause=1;
                else if (strcmp(*argv,"-debug") == 0)
                        c_debug=1;

+#ifndef OPENSSL_NO_TLSEXT
+               else if (strcmp(*argv,"-tlsextdebug") == 0)
+                       c_tlsextdebug=1;
+#endif

 #ifdef WATT32
                else if (strcmp(*argv,"-wdebug") == 0)
                        dbug_init();
 #ifdef WATT32
                else if (strcmp(*argv,"-wdebug") == 0)
                        dbug_init();


@@ -384,6 +537,27 @@ int MAIN(int argc, char **argv)
                        nbio_test=1;
                else if (strcmp(*argv,"-state") == 0)
                        state=1;
                        nbio_test=1;
                else if (strcmp(*argv,"-state") == 0)
                        state=1;

+#ifndef OPENSSL_NO_PSK
+                else if (strcmp(*argv,"-psk_identity") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       psk_identity=*(++argv);
+                       }
+                else if (strcmp(*argv,"-psk") == 0)
+                       {
+                        size_t j;
+
+                       if (--argc < 1) goto bad;
+                       psk_key=*(++argv);
+                       for (j = 0; j < strlen(psk_key); j++)
+                                {
+                                if (isxdigit((int)psk_key[j]))
+                                        continue;
+                                BIO_printf(bio_err,"Not a hex number '%s'\n",*argv);
+                                goto bad;
+                                }
+                       }
+#endif

 #ifndef OPENSSL_NO_SSL2
                else if (strcmp(*argv,"-ssl2") == 0)
                        meth=SSLv2_client_method();
 #ifndef OPENSSL_NO_SSL2
                else if (strcmp(*argv,"-ssl2") == 0)
                        meth=SSLv2_client_method();


@@ -400,14 +574,14 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"-dtls1") == 0)
                        {
                        meth=DTLSv1_client_method();
                else if (strcmp(*argv,"-dtls1") == 0)
                        {
                        meth=DTLSv1_client_method();

-                       sock_type=SOCK_DGRAM;
+                       socket_type=SOCK_DGRAM;

                        }
                else if (strcmp(*argv,"-timeout") == 0)
                        enable_timeouts=1;
                else if (strcmp(*argv,"-mtu") == 0)
                        {
                        if (--argc < 1) goto bad;
                        }
                else if (strcmp(*argv,"-timeout") == 0)
                        enable_timeouts=1;
                else if (strcmp(*argv,"-mtu") == 0)
                        {
                        if (--argc < 1) goto bad;

-                       mtu = atol(*(++argv));
+                       socket_mtu = atol(*(++argv));

                        }
 #endif
                else if (strcmp(*argv,"-bugs") == 0)
                        }
 #endif
                else if (strcmp(*argv,"-bugs") == 0)


@@ -447,6 +621,12 @@ int MAIN(int argc, char **argv)
                        off|=SSL_OP_NO_SSLv3;
                else if (strcmp(*argv,"-no_ssl2") == 0)
                        off|=SSL_OP_NO_SSLv2;
                        off|=SSL_OP_NO_SSLv3;
                else if (strcmp(*argv,"-no_ssl2") == 0)
                        off|=SSL_OP_NO_SSLv2;

+               else if (strcmp(*argv,"-no_comp") == 0)
+                       { off|=SSL_OP_NO_COMPRESSION; }
+#ifndef OPENSSL_NO_TLSEXT
+               else if (strcmp(*argv,"-no_ticket") == 0)
+                       { off|=SSL_OP_NO_TICKET; }
+#endif

                else if (strcmp(*argv,"-serverpref") == 0)
                        off|=SSL_OP_CIPHER_SERVER_PREFERENCE;
                else if (strcmp(*argv,"-cipher") == 0)
                else if (strcmp(*argv,"-serverpref") == 0)
                        off|=SSL_OP_CIPHER_SERVER_PREFERENCE;
                else if (strcmp(*argv,"-cipher") == 0)


@@ -463,9 +643,13 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        ++argv;
                        if (strcmp(*argv,"smtp") == 0)
                        if (--argc < 1) goto bad;
                        ++argv;
                        if (strcmp(*argv,"smtp") == 0)

-                               starttls_proto = 1;
+                               starttls_proto = PROTO_SMTP;

                        else if (strcmp(*argv,"pop3") == 0)
                        else if (strcmp(*argv,"pop3") == 0)

-                               starttls_proto = 2;
+                               starttls_proto = PROTO_POP3;
+                       else if (strcmp(*argv,"imap") == 0)
+                               starttls_proto = PROTO_IMAP;
+                       else if (strcmp(*argv,"ftp") == 0)
+                               starttls_proto = PROTO_FTP;

                        else
                                goto bad;
                        }
                        else
                                goto bad;
                        }


@@ -481,6 +665,14 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        inrand= *(++argv);
                        }
                        if (--argc < 1) goto bad;
                        inrand= *(++argv);
                        }

+#ifndef OPENSSL_NO_TLSEXT
+               else if (strcmp(*argv,"-servername") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       servername= *(++argv);
+                       /* meth=TLSv1_client_method(); */
+                       }
+#endif

                else
                        {
                        BIO_printf(bio_err,"unknown option %s\n",*argv);
                else
                        {
                        BIO_printf(bio_err,"unknown option %s\n",*argv);


@@ -569,6 +761,14 @@ bad:
                goto end;
                }
 
                goto end;
                }
 

+#ifndef OPENSSL_NO_PSK
+       if (psk_key != NULL)
+               {
+               if (c_debug)
+                       BIO_printf(bio_c_out, "PSK key given, setting client callback\n");
+               SSL_CTX_set_psk_client_callback(ctx, psk_client_cb);
+               }
+#endif

        if (bugs)
                SSL_CTX_set_options(ctx,SSL_OP_ALL|off);
        else
        if (bugs)
                SSL_CTX_set_options(ctx,SSL_OP_ALL|off);
        else


@@ -576,7 +776,7 @@ bad:
        /* DTLS: partial reads end up discarding unread UDP bytes :-( 
         * Setting read ahead solves this problem.
         */
        /* DTLS: partial reads end up discarding unread UDP bytes :-( 
         * Setting read ahead solves this problem.
         */

-       if (sock_type == SOCK_DGRAM) SSL_CTX_set_read_ahead(ctx, 1);
+       if (socket_type == SOCK_DGRAM) SSL_CTX_set_read_ahead(ctx, 1);

 
        if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
        if (cipher != NULL)
 
        if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
        if (cipher != NULL)


@@ -604,8 +804,50 @@ bad:
 
        store = SSL_CTX_get_cert_store(ctx);
        X509_STORE_set_flags(store, vflags);
 
        store = SSL_CTX_get_cert_store(ctx);
        X509_STORE_set_flags(store, vflags);

+#ifndef OPENSSL_NO_TLSEXT
+       if (servername != NULL)
+               {
+               tlsextcbp.biodebug = bio_err;
+               SSL_CTX_set_tlsext_servername_callback(ctx, ssl_servername_cb);
+               SSL_CTX_set_tlsext_servername_arg(ctx, &tlsextcbp);
+               }
+#endif

 
        con=SSL_new(ctx);
 
        con=SSL_new(ctx);

+       if (sess_in)
+               {
+               SSL_SESSION *sess;
+               BIO *stmp = BIO_new_file(sess_in, "r");
+               if (!stmp)
+                       {
+                       BIO_printf(bio_err, "Can't open session file %s\n",
+                                               sess_in);
+                       ERR_print_errors(bio_err);
+                       goto end;
+                       }
+               sess = PEM_read_bio_SSL_SESSION(stmp, NULL, 0, NULL);
+               BIO_free(stmp);
+               if (!sess)
+                       {
+                       BIO_printf(bio_err, "Can't open session file %s\n",
+                                               sess_in);
+                       ERR_print_errors(bio_err);
+                       goto end;
+                       }
+               SSL_set_session(con, sess);
+               SSL_SESSION_free(sess);
+               }
+#ifndef OPENSSL_NO_TLSEXT
+       if (servername != NULL)
+               {
+               if (!SSL_set_tlsext_host_name(con,servername))
+                       {
+                       BIO_printf(bio_err,"Unable to set TLS servername extension.\n");
+                       ERR_print_errors(bio_err);
+                       goto end;
+                       }
+               }
+#endif

 #ifndef OPENSSL_NO_KRB5
        if (con  &&  (con->kssl_ctx = kssl_ctx_new()) != NULL)
                 {
 #ifndef OPENSSL_NO_KRB5
        if (con  &&  (con->kssl_ctx = kssl_ctx_new()) != NULL)
                 {


@@ -616,7 +858,7 @@ bad:
 
 re_start:
 
 
 re_start:
 

-       if (init_client(&s,host,port,sock_type) == 0)
+       if (init_client(&s,host,port,socket_type) == 0)

                {
                BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
                SHUTDOWN(s);
                {
                BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error());
                SHUTDOWN(s);


@@ -651,9 +893,9 @@ re_start:
                        goto end;
                        }
 
                        goto end;
                        }
 

-               BIO_ctrl_set_connected(sbio, 1, &peer);
+               (void)BIO_ctrl_set_connected(sbio, 1, &peer);

 
 

-               if ( enable_timeouts)
+               if (enable_timeouts)

                        {
                        timeout.tv_sec = 0;
                        timeout.tv_usec = DGRAM_RCV_TIMEOUT;
                        {
                        timeout.tv_sec = 0;
                        timeout.tv_usec = DGRAM_RCV_TIMEOUT;


@@ -664,10 +906,10 @@ re_start:
                        BIO_ctrl(sbio, BIO_CTRL_DGRAM_SET_SEND_TIMEOUT, 0, &timeout);
                        }
 
                        BIO_ctrl(sbio, BIO_CTRL_DGRAM_SET_SEND_TIMEOUT, 0, &timeout);
                        }
 

-               if ( mtu > 0)
+               if (socket_mtu > 0)

                        {
                        SSL_set_options(con, SSL_OP_NO_QUERY_MTU);
                        {
                        SSL_set_options(con, SSL_OP_NO_QUERY_MTU);

-                       SSL_set_mtu(con, mtu);
+                       SSL_set_mtu(con, socket_mtu);

                        }
                else
                        /* want to do MTU discovery */
                        }
                else
                        /* want to do MTU discovery */


@@ -690,13 +932,20 @@ re_start:
                {
                con->debug=1;
                BIO_set_callback(sbio,bio_dump_callback);
                {
                con->debug=1;
                BIO_set_callback(sbio,bio_dump_callback);

-               BIO_set_callback_arg(sbio,bio_c_out);
+               BIO_set_callback_arg(sbio,(char *)bio_c_out);

                }
        if (c_msg)
                {
                SSL_set_msg_callback(con, msg_cb);
                SSL_set_msg_callback_arg(con, bio_c_out);
                }
                }
        if (c_msg)
                {
                SSL_set_msg_callback(con, msg_cb);
                SSL_set_msg_callback_arg(con, bio_c_out);
                }

+#ifndef OPENSSL_NO_TLSEXT
+       if (c_tlsextdebug)
+               {
+               SSL_set_tlsext_debug_callback(con, tlsext_cb);
+               SSL_set_tlsext_debug_arg(con, bio_c_out);
+               }
+#endif

 
        SSL_set_bio(con,sbio,sbio);
        SSL_set_connect_state(con);
 
        SSL_set_bio(con,sbio,sbio);
        SSL_set_connect_state(con);


@@ -716,18 +965,93 @@ re_start:
        sbuf_off=0;
 
        /* This is an ugly hack that does a lot of assumptions */
        sbuf_off=0;
 
        /* This is an ugly hack that does a lot of assumptions */

-       if (starttls_proto == 1)
+       /* We do have to handle multi-line responses which may come
+          in a single packet or not. We therefore have to use
+          BIO_gets() which does need a buffering BIO. So during
+          the initial chitchat we do push a buffering BIO into the
+          chain that is removed again later on to not disturb the
+          rest of the s_client operation. */
+       if (starttls_proto == PROTO_SMTP)

                {
                {

-               BIO_read(sbio,mbuf,BUFSIZZ);
+               int foundit=0;
+               BIO *fbio = BIO_new(BIO_f_buffer());
+               BIO_push(fbio, sbio);
+               /* wait for multi-line response to end from SMTP */
+               do
+                       {
+                       mbuf_len = BIO_gets(fbio,mbuf,BUFSIZZ);
+                       }
+               while (mbuf_len>3 && mbuf[3]=='-');
+               /* STARTTLS command requires EHLO... */
+               BIO_printf(fbio,"EHLO openssl.client.net\r\n");
+               (void)BIO_flush(fbio);
+               /* wait for multi-line response to end EHLO SMTP response */
+               do
+                       {
+                       mbuf_len = BIO_gets(fbio,mbuf,BUFSIZZ);
+                       if (strstr(mbuf,"STARTTLS"))
+                               foundit=1;
+                       }
+               while (mbuf_len>3 && mbuf[3]=='-');
+               (void)BIO_flush(fbio);
+               BIO_pop(fbio);
+               BIO_free(fbio);
+               if (!foundit)
+                       BIO_printf(bio_err,
+                                  "didn't found starttls in server response,"
+                                  " try anyway...\n");

                BIO_printf(sbio,"STARTTLS\r\n");
                BIO_read(sbio,sbuf,BUFSIZZ);
                }
                BIO_printf(sbio,"STARTTLS\r\n");
                BIO_read(sbio,sbuf,BUFSIZZ);
                }

-       if (starttls_proto == 2)
+       else if (starttls_proto == PROTO_POP3)

                {
                BIO_read(sbio,mbuf,BUFSIZZ);
                BIO_printf(sbio,"STLS\r\n");
                BIO_read(sbio,sbuf,BUFSIZZ);
                }
                {
                BIO_read(sbio,mbuf,BUFSIZZ);
                BIO_printf(sbio,"STLS\r\n");
                BIO_read(sbio,sbuf,BUFSIZZ);
                }

+       else if (starttls_proto == PROTO_IMAP)
+               {
+               int foundit=0;
+               BIO *fbio = BIO_new(BIO_f_buffer());
+               BIO_push(fbio, sbio);
+               BIO_gets(fbio,mbuf,BUFSIZZ);
+               /* STARTTLS command requires CAPABILITY... */
+               BIO_printf(fbio,". CAPABILITY\r\n");
+               (void)BIO_flush(fbio);
+               /* wait for multi-line CAPABILITY response */
+               do
+                       {
+                       mbuf_len = BIO_gets(fbio,mbuf,BUFSIZZ);
+                       if (strstr(mbuf,"STARTTLS"))
+                               foundit=1;
+                       }
+               while (mbuf_len>3 && mbuf[0]!='.');
+               (void)BIO_flush(fbio);
+               BIO_pop(fbio);
+               BIO_free(fbio);
+               if (!foundit)
+                       BIO_printf(bio_err,
+                                  "didn't found STARTTLS in server response,"
+                                  " try anyway...\n");
+               BIO_printf(sbio,". STARTTLS\r\n");
+               BIO_read(sbio,sbuf,BUFSIZZ);
+               }
+       else if (starttls_proto == PROTO_FTP)
+               {
+               BIO *fbio = BIO_new(BIO_f_buffer());
+               BIO_push(fbio, sbio);
+               /* wait for multi-line response to end from FTP */
+               do
+                       {
+                       mbuf_len = BIO_gets(fbio,mbuf,BUFSIZZ);
+                       }
+               while (mbuf_len>3 && mbuf[3]=='-');
+               (void)BIO_flush(fbio);
+               BIO_pop(fbio);
+               BIO_free(fbio);
+               BIO_printf(sbio,"AUTH TLS\r\n");
+               BIO_read(sbio,sbuf,BUFSIZZ);
+               }

 
        for (;;)
                {
 
        for (;;)
                {


@@ -745,6 +1069,23 @@ re_start:
                        if (in_init)
                                {
                                in_init=0;
                        if (in_init)
                                {
                                in_init=0;

+#ifndef OPENSSL_NO_TLSEXT
+                               if (servername != NULL && !SSL_session_reused(con))
+                                       {
+                                       BIO_printf(bio_c_out,"Server did %sacknowledge servername extension.\n",tlsextcbp.ack?"":"not ");
+                                       }
+#endif
+                               if (sess_out)
+                                       {
+                                       BIO *stmp = BIO_new_file(sess_out, "w");
+                                       if (stmp)
+                                               {
+                                               PEM_write_bio_SSL_SESSION(stmp, SSL_get_session(con));
+                                               BIO_free(stmp);
+                                               }
+                                       else 
+                                               BIO_printf(bio_err, "Error writing session file %s\n", sess_out);
+                                       }

                                print_stuff(bio_c_out,con,full_log);
                                if (full_log > 0) full_log--;
 
                                print_stuff(bio_c_out,con,full_log);
                                if (full_log > 0) full_log--;
 


@@ -752,7 +1093,7 @@ re_start:
                                        {
                                        BIO_printf(bio_err,"%s",mbuf);
                                        /* We don't need to know any more */
                                        {
                                        BIO_printf(bio_err,"%s",mbuf);
                                        /* We don't need to know any more */

-                                       starttls_proto = 0;
+                                       starttls_proto = PROTO_OFF;

                                        }
 
                                if (reconnect)
                                        }
 
                                if (reconnect)


@@ -771,22 +1112,22 @@ re_start:
 
                if (!ssl_pending)
                        {
 
                if (!ssl_pending)
                        {

-#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE)
+#if !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_NETWARE) && !defined (OPENSSL_SYS_BEOS_R5)

                        if (tty_on)
                                {
                        if (tty_on)
                                {

-                               if (read_tty)  FD_SET(fileno(stdin),&readfds);
-                               if (write_tty) FD_SET(fileno(stdout),&writefds);
+                               if (read_tty)  openssl_fdset(fileno(stdin),&readfds);
+                               if (write_tty) openssl_fdset(fileno(stdout),&writefds);

                                }
                        if (read_ssl)
                                }
                        if (read_ssl)

-                               FD_SET(SSL_get_fd(con),&readfds);
+                               openssl_fdset(SSL_get_fd(con),&readfds);

                        if (write_ssl)
                        if (write_ssl)

-                               FD_SET(SSL_get_fd(con),&writefds);
+                               openssl_fdset(SSL_get_fd(con),&writefds);

 #else
                        if(!tty_on || !write_tty) {
                                if (read_ssl)
 #else
                        if(!tty_on || !write_tty) {
                                if (read_ssl)

-                                       FD_SET(SSL_get_fd(con),&readfds);
+                                       openssl_fdset(SSL_get_fd(con),&readfds);

                                if (write_ssl)
                                if (write_ssl)

-                                       FD_SET(SSL_get_fd(con),&writefds);
+                                       openssl_fdset(SSL_get_fd(con),&writefds);

                        }
 #endif
 /*                     printf("mode tty(%d %d%d) ssl(%d%d)\n",
                        }
 #endif
 /*                     printf("mode tty(%d %d%d) ssl(%d%d)\n",


@@ -831,6 +1172,25 @@ re_start:
                                } else  i=select(width,(void *)&readfds,(void *)&writefds,
                                        NULL,NULL);
                        }
                                } else  i=select(width,(void *)&readfds,(void *)&writefds,
                                        NULL,NULL);
                        }

+#elif defined(OPENSSL_SYS_BEOS_R5)
+                       /* Under BeOS-R5 the situation is similar to DOS */
+                       i=0;
+                       stdin_set = 0;
+                       (void)fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
+                       if(!write_tty) {
+                               if(read_tty) {
+                                       tv.tv_sec = 1;
+                                       tv.tv_usec = 0;
+                                       i=select(width,(void *)&readfds,(void *)&writefds,
+                                                NULL,&tv);
+                                       if (read(fileno(stdin), sbuf, 0) >= 0)
+                                               stdin_set = 1;
+                                       if (!i && (stdin_set != 1 || !read_tty))
+                                               continue;
+                               } else  i=select(width,(void *)&readfds,(void *)&writefds,
+                                        NULL,NULL);
+                       }
+                       (void)fcntl(fileno(stdin), F_SETFL, 0);

 #else
                        i=select(width,(void *)&readfds,(void *)&writefds,
                                 NULL,NULL);
 #else
                        i=select(width,(void *)&readfds,(void *)&writefds,
                                 NULL,NULL);


@@ -911,8 +1271,8 @@ re_start:
                                goto shut;
                                }
                        }
                                goto shut;
                                }
                        }

-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE)
-               /* Assume Windows/DOS can always write */
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_BEOS_R5)
+               /* Assume Windows/DOS/BeOS can always write */

                else if (!ssl_pending && write_tty)
 #else
                else if (!ssl_pending && FD_ISSET(fileno(stdout),&writefds))
                else if (!ssl_pending && write_tty)
 #else
                else if (!ssl_pending && FD_ISSET(fileno(stdout),&writefds))


@@ -921,7 +1281,7 @@ re_start:
 #ifdef CHARSET_EBCDIC
                        ascii2ebcdic(&(sbuf[sbuf_off]),&(sbuf[sbuf_off]),sbuf_len);
 #endif
 #ifdef CHARSET_EBCDIC
                        ascii2ebcdic(&(sbuf[sbuf_off]),&(sbuf[sbuf_off]),sbuf_len);
 #endif

-                       i=write(fileno(stdout),&(sbuf[sbuf_off]),sbuf_len);
+                       i=raw_write_stdout(&(sbuf[sbuf_off]),sbuf_len);

 
                        if (i <= 0)
                                {
 
                        if (i <= 0)
                                {


@@ -999,7 +1359,9 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
                else if ((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
 #endif
 #elif defined (OPENSSL_SYS_NETWARE)
                else if ((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
 #endif
 #elif defined (OPENSSL_SYS_NETWARE)

-        else if (_kbhit())
+               else if (_kbhit())
+#elif defined(OPENSSL_SYS_BEOS_R5)
+               else if (stdin_set)

 #else
                else if (FD_ISSET(fileno(stdin),&readfds))
 #endif
 #else
                else if (FD_ISSET(fileno(stdin),&readfds))
 #endif


@@ -1008,7 +1370,7 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
                                {
                                int j, lf_num;
 
                                {
                                int j, lf_num;
 

-                               i=read(fileno(stdin),cbuf,BUFSIZZ/2);
+                               i=raw_read_stdin(cbuf,BUFSIZZ/2);

                                lf_num = 0;
                                /* both loops are skipped when i <= 0 */
                                for (j = 0; j < i; j++)
                                lf_num = 0;
                                /* both loops are skipped when i <= 0 */
                                for (j = 0; j < i; j++)


@@ -1027,7 +1389,7 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
                                assert(lf_num == 0);
                                }
                        else
                                assert(lf_num == 0);
                                }
                        else

-                               i=read(fileno(stdin),cbuf,BUFSIZZ);
+                               i=raw_read_stdin(cbuf,BUFSIZZ);

 
                        if ((!c_ign_eof) && ((i <= 0) || (cbuf[0] == 'Q')))
                                {
 
                        if ((!c_ign_eof) && ((i <= 0) || (cbuf[0] == 'Q')))
                                {


@@ -1055,13 +1417,18 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
                        }
                }
 shut:
                        }
                }
 shut:

+       if (in_init)
+               print_stuff(bio_c_out,con,full_log);

        SSL_shutdown(con);
        SHUTDOWN(SSL_get_fd(con));
        ret=0;
 end:
        SSL_shutdown(con);
        SHUTDOWN(SSL_get_fd(con));
        ret=0;
 end:

-       if(prexit) print_stuff(bio_c_out,con,1);
-       if (con != NULL) SSL_free(con);
-       if (con2 != NULL) SSL_free(con2);
+       if (con != NULL)
+               {
+               if (prexit != 0)
+                       print_stuff(bio_c_out,con,1);
+               SSL_free(con);
+               }

        if (ctx != NULL) SSL_CTX_free(ctx);
        if (cert)
                X509_free(cert);
        if (ctx != NULL) SSL_CTX_free(ctx);
        if (cert)
                X509_free(cert);


@@ -1093,7 +1460,9 @@ static void print_stuff(BIO *bio, SSL *s, int full)
        SSL_CIPHER *c;
        X509_NAME *xn;
        int j,i;
        SSL_CIPHER *c;
        X509_NAME *xn;
        int j,i;

+#ifndef OPENSSL_NO_COMP

        const COMP_METHOD *comp, *expansion;
        const COMP_METHOD *comp, *expansion;

+#endif

 
        if (full)
                {
 
        if (full)
                {


@@ -1196,17 +1565,19 @@ static void print_stuff(BIO *bio, SSL *s, int full)
                                                         EVP_PKEY_bits(pktmp));
                EVP_PKEY_free(pktmp);
        }
                                                         EVP_PKEY_bits(pktmp));
                EVP_PKEY_free(pktmp);
        }

+#ifndef OPENSSL_NO_COMP

        comp=SSL_get_current_compression(s);
        expansion=SSL_get_current_expansion(s);
        BIO_printf(bio,"Compression: %s\n",
                comp ? SSL_COMP_get_name(comp) : "NONE");
        BIO_printf(bio,"Expansion: %s\n",
                expansion ? SSL_COMP_get_name(expansion) : "NONE");
        comp=SSL_get_current_compression(s);
        expansion=SSL_get_current_expansion(s);
        BIO_printf(bio,"Compression: %s\n",
                comp ? SSL_COMP_get_name(comp) : "NONE");
        BIO_printf(bio,"Expansion: %s\n",
                expansion ? SSL_COMP_get_name(expansion) : "NONE");

+#endif

        SSL_SESSION_print(bio,SSL_get_session(s));
        BIO_printf(bio,"---\n");
        if (peer != NULL)
                X509_free(peer);
        /* flush, or debugging output gets mixed with http response */
        SSL_SESSION_print(bio,SSL_get_session(s));
        BIO_printf(bio,"---\n");
        if (peer != NULL)
                X509_free(peer);
        /* flush, or debugging output gets mixed with http response */

-       BIO_flush(bio);
+       (void)BIO_flush(bio);

        }
 
        }