diff options
| author | Rich Salz <rsalz@akamai.com> | 2014-08-09 08:02:20 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2014-08-09 08:02:20 -0400 |
| commit | f642ebc1e2dca34bc2b3c46796c131e1f5077bee (patch) | |
| tree | a8f54bb26068ebd4bf5a1ef4684ab98758cebc4f /apps | |
| parent | 693b71fa719598a487165918cbbc0f7f62816c83 (diff) | |
Undo unapproved commit that removed DJGPP and WATT32
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_client.c | 7 | ||||
| -rw-r--r-- | apps/s_server.c | 2 | ||||
| -rw-r--r-- | apps/s_socket.c | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 1948328927..e1be6a908b 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -308,6 +308,9 @@ static void sc_usage(void) BIO_printf(bio_err," -prexit - print session information even on connection failure\n"); BIO_printf(bio_err," -showcerts - show all certificates in the chain\n"); BIO_printf(bio_err," -debug - extra output\n"); +#ifdef WATT32 + BIO_printf(bio_err," -wdebug - WATT-32 tcp debugging\n"); +#endif BIO_printf(bio_err," -msg - Show protocol messages\n"); BIO_printf(bio_err," -nbio_test - more ssl protocol testing\n"); BIO_printf(bio_err," -state - print the 'ssl' states\n"); @@ -828,6 +831,10 @@ static char *jpake_secret = NULL; else if (strcmp(*argv,"-status") == 0) c_status_req=1; #endif +#ifdef WATT32 + else if (strcmp(*argv,"-wdebug") == 0) + dbug_init(); +#endif else if (strcmp(*argv,"-msg") == 0) c_msg=1; else if (strcmp(*argv,"-msgfile") == 0) diff --git a/apps/s_server.c b/apps/s_server.c index 4b93fdefa2..1e15281c21 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2971,7 +2971,7 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context) BIO_printf(bio_s_out,"read R BLOCK\n"); #if defined(OPENSSL_SYS_NETWARE) delay(1000); -#elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__) +#elif !defined(OPENSSL_SYS_MSDOS) sleep(1); #endif continue; diff --git a/apps/s_socket.c b/apps/s_socket.c index 093b9c82ad..e83baf4e70 100644 --- a/apps/s_socket.c +++ b/apps/s_socket.c @@ -178,7 +178,12 @@ static void sock_cleanup(void) static int ssl_sock_init(void) { -#if defined(OPENSSL_SYS_WINDOWS) +#ifdef WATT32 + extern int _watt_do_exit; + _watt_do_exit = 0; + if (sock_init()) + return (0); +#elif defined(OPENSSL_SYS_WINDOWS) if (!wsa_init_done) { int err; |