X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=apps%2Fs_client.c;h=9cfe2b15804b842fce48e21fd1503a984850a449;hb=1532a839fc3bfd6240d56997ec0df13cbaa5b868;hp=ac5d2f10c20f597ba98f76386b15cf9ca03b9e31;hpb=c04f8cf44a3b204b82f5f1f5d1ad9dbc738459f1;p=oweals%2Fopenssl.git diff --git a/apps/s_client.c b/apps/s_client.c index ac5d2f10c2..9cfe2b1580 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -60,8 +60,7 @@ #include #include #include -#include -#ifdef OPENSSL_NO_STDIO +#ifdef NO_STDIO #define APPS_WIN16 #endif @@ -69,7 +68,7 @@ recursive header file inclusion, resulting in the compiler complaining that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which is needed to have fileno() declared correctly... So let's define u_int */ -#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT) +#if defined(VMS) && defined(__DECC) && !defined(__U_INT) #define __U_INT typedef unsigned int u_int; #endif @@ -80,15 +79,15 @@ typedef unsigned int u_int; #include #include #include -#include +#include #include "s_apps.h" -#ifdef OPENSSL_SYS_WINDOWS +#ifdef WINDOWS #include #endif -#if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000) +#if (defined(VMS) && __VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */ #undef FIONBIO #endif @@ -152,10 +151,8 @@ static void sc_usage(void) BIO_printf(bio_err," -tls1 - just use TLSv1\n"); BIO_printf(bio_err," -no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n"); BIO_printf(bio_err," -bugs - Switch on all SSL implementation bug workarounds\n"); - BIO_printf(bio_err," -serverpref - Use server's cipher preferences (only SSLv2)\n"); BIO_printf(bio_err," -cipher - preferred cipher to use, use the 'openssl ciphers'\n"); BIO_printf(bio_err," command to see what is available\n"); - BIO_printf(bio_err," -engine id - Initialise and use the specified engine\n"); BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); } @@ -166,7 +163,6 @@ int MAIN(int argc, char **argv) { int off=0; SSL *con=NULL,*con2=NULL; - X509_STORE *store = NULL; int s,k,width,state=0; char *cbuf=NULL,*sbuf=NULL; int cbuf_len,cbuf_off; @@ -182,21 +178,19 @@ 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 prexit = 0, vflags = 0; + int prexit = 0; SSL_METHOD *meth=NULL; BIO *sbio; char *inrand=NULL; - char *engine_id=NULL; - ENGINE *e=NULL; -#ifdef OPENSSL_SYS_WINDOWS +#ifdef WINDOWS struct timeval tv; #endif -#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3) +#if !defined(NO_SSL2) && !defined(NO_SSL3) meth=SSLv23_client_method(); -#elif !defined(OPENSSL_NO_SSL3) +#elif !defined(NO_SSL3) meth=SSLv3_client_method(); -#elif !defined(OPENSSL_NO_SSL2) +#elif !defined(NO_SSL2) meth=SSLv2_client_method(); #endif @@ -256,10 +250,6 @@ int MAIN(int argc, char **argv) if (--argc < 1) goto bad; cert_file= *(++argv); } - else if (strcmp(*argv,"-crl_check") == 0) - 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,"-prexit") == 0) prexit=1; else if (strcmp(*argv,"-crlf") == 0) @@ -281,15 +271,15 @@ int MAIN(int argc, char **argv) nbio_test=1; else if (strcmp(*argv,"-state") == 0) state=1; -#ifndef OPENSSL_NO_SSL2 +#ifndef NO_SSL2 else if (strcmp(*argv,"-ssl2") == 0) meth=SSLv2_client_method(); #endif -#ifndef OPENSSL_NO_SSL3 +#ifndef NO_SSL3 else if (strcmp(*argv,"-ssl3") == 0) meth=SSLv3_client_method(); #endif -#ifndef OPENSSL_NO_TLS1 +#ifndef NO_TLS1 else if (strcmp(*argv,"-tls1") == 0) meth=TLSv1_client_method(); #endif @@ -320,8 +310,6 @@ int MAIN(int argc, char **argv) off|=SSL_OP_NO_SSLv3; else if (strcmp(*argv,"-no_ssl2") == 0) off|=SSL_OP_NO_SSLv2; - else if (strcmp(*argv,"-serverpref") == 0) - off|=SSL_OP_CIPHER_SERVER_PREFERENCE; else if (strcmp(*argv,"-cipher") == 0) { if (--argc < 1) goto bad; @@ -331,11 +319,6 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv,"-nbio") == 0) { c_nbio=1; } #endif - else if (strcmp(*argv,"-engine") == 0) - { - if (--argc < 1) goto bad; - engine_id = *(++argv); - } else if (strcmp(*argv,"-rand") == 0) { if (--argc < 1) goto bad; @@ -381,9 +364,6 @@ bad: OpenSSL_add_ssl_algorithms(); SSL_load_error_strings(); - - e = setup_engine(bio_err, engine_id, 1); - ctx=SSL_CTX_new(meth); if (ctx == NULL) { @@ -420,16 +400,8 @@ bad: /* goto end; */ } - store = SSL_CTX_get_cert_store(ctx); - X509_STORE_set_flags(store, vflags); con=SSL_new(ctx); -#ifndef OPENSSL_NO_KRB5 - if (con && (con->kssl_ctx = kssl_ctx_new()) != NULL) - { - kssl_ctx_setstring(con->kssl_ctx, KSSL_SERVER, host); - } -#endif /* OPENSSL_NO_KRB5 */ /* SSL_set_cipher_list(con,"RC4-MD5"); */ re_start: @@ -524,7 +496,7 @@ re_start: if (!ssl_pending) { -#ifndef OPENSSL_SYS_WINDOWS +#ifndef WINDOWS if (tty_on) { if (read_tty) FD_SET(fileno(stdin),&readfds); @@ -551,7 +523,7 @@ re_start: * will choke the compiler: if you do have a cast then * you can either go for (int *) or (void *). */ -#ifdef OPENSSL_SYS_WINDOWS +#ifdef WINDOWS /* Under Windows we make the assumption that we can * always write to the tty: therefore if we need to * write to the tty we just fall through. Otherwise @@ -650,7 +622,7 @@ re_start: goto shut; } } -#ifdef OPENSSL_SYS_WINDOWS +#ifdef WINDOWS /* Assume Windows can always write */ else if (!ssl_pending && write_tty) #else @@ -731,7 +703,7 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240 } } -#ifdef OPENSSL_SYS_WINDOWS +#ifdef WINDOWS else if ((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0))) #else else if (FD_ISSET(fileno(stdin),&readfds)) @@ -803,7 +775,6 @@ end: BIO_free(bio_c_out); bio_c_out=NULL; } - apps_shutdown(); EXIT(ret); } @@ -925,5 +896,7 @@ static void print_stuff(BIO *bio, SSL *s, int full) BIO_printf(bio,"---\n"); if (peer != NULL) X509_free(peer); + /* flush, or debugging output gets mixed with http response */ + BIO_flush(bio); }