diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-08-09 13:01:48 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-08-09 13:01:48 +0000 |
| commit | 1b1a6e7808abfcc658ce4ff8b344ddcd517cfbd3 (patch) | |
| tree | 74816efc0f983ff88f78846a9cf508b3e5e37602 /apps/s_client.c | |
| parent | 385be6eb209fc242a7e62b711d29df523ee1ca93 (diff) | |
-crlf option.
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index b06104130e..ea3e039e30 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -56,9 +56,7 @@ * [including the GNU Public Licence.] */ -#ifdef APPS_CRLF -# include <assert.h> -#endif +#include <assert.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -142,9 +140,7 @@ static void sc_usage(void) #ifdef FIONBIO BIO_printf(bio_err," -nbio - Run with non-blocking IO\n"); #endif -#ifdef APPS_CRLF /* won't be #ifdef'd in next release */ BIO_printf(bio_err," -crlf - convert LF from terminal into CRLF\n"); -#endif BIO_printf(bio_err," -quiet - no s_client output\n"); BIO_printf(bio_err," -ssl2 - just use SSLv2\n"); BIO_printf(bio_err," -ssl3 - just use SSLv3\n"); @@ -171,9 +167,7 @@ int MAIN(int argc, char **argv) char *cert_file=NULL,*key_file=NULL; char *CApath=NULL,*CAfile=NULL,*cipher=NULL; int reconnect=0,badop=0,verify=SSL_VERIFY_NONE,bugs=0; -#ifdef APPS_CRLF int crlf=0; -#endif 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; @@ -244,10 +238,8 @@ int MAIN(int argc, char **argv) if (--argc < 1) goto bad; cert_file= *(++argv); } -#ifdef APPS_CRLF else if (strcmp(*argv,"-crlf") == 0) crlf=1; -#endif else if (strcmp(*argv,"-quiet") == 0) c_quiet=1; else if (strcmp(*argv,"-pause") == 0) @@ -647,7 +639,6 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240 #ifndef WINDOWS else if (FD_ISSET(fileno(stdin),&readfds)) { -#ifdef APPS_CRLF if (crlf) { int j, lf_num; @@ -671,7 +662,6 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240 assert(lf_num == 0); } else -#endif i=read(fileno(stdin),cbuf,BUFSIZZ); if ((!c_quiet) && ((i <= 0) || (cbuf[0] == 'Q'))) |