generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RT4232: Extra space in help message.

Browse Source 
It turns out that -pause calls the undocumented function SSL_set_debug.
That just sets flag inside the SSL structure.  That flag, despite
the command is never used.  So remove the flag, the field, and the
function.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Rich Salz
2016-01-13 23:11:01 -05:00
committed by Rich Salz
parent a7cf07b496
commit 3a4e9367d8
7 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/s_client.c
View File

@@ -189,7 +189,6 @@ static int async = 0;
static int c_nbio = 0;
static int c_tlsextdebug = 0;
static int c_status_req = 0;
static int c_Pause = 0;
static int c_debug = 0;
static int c_msg = 0;
static int c_showcerts = 0;
@@ -619,7 +618,7 @@ typedef enum OPTION_choice {
OPT_CERTFORM, OPT_CRLFORM, OPT_VERIFY_RET_ERROR, OPT_VERIFY_QUIET,
OPT_BRIEF, OPT_PREXIT, OPT_CRLF, OPT_QUIET, OPT_NBIO,
OPT_SSL_CLIENT_ENGINE, OPT_RAND, OPT_IGN_EOF, OPT_NO_IGN_EOF,
OPT_PAUSE, OPT_DEBUG, OPT_TLSEXTDEBUG, OPT_STATUS, OPT_WDEBUG,
OPT_DEBUG, OPT_TLSEXTDEBUG, OPT_STATUS, OPT_WDEBUG,
OPT_MSG, OPT_MSGFILE, OPT_ENGINE, OPT_TRACE, OPT_SECURITY_DEBUG,
OPT_SECURITY_DEBUG_VERBOSE, OPT_SHOWCERTS, OPT_NBIO_TEST, OPT_STATE,
OPT_PSK_IDENTITY, OPT_PSK, OPT_SRPUSER, OPT_SRPPASS, OPT_SRP_STRENGTH,
@@ -666,7 +665,6 @@ OPTIONS s_client_options[] = {
"DANE TLSA rrdata presentation form"},
{"reconnect", OPT_RECONNECT, '-',
"Drop and re-make the connection with the same Session-ID"},
{"pause", OPT_PAUSE, '-', "Sleep after each read and write system call"},
{"showcerts", OPT_SHOWCERTS, '-', "Show all certificates in the chain"},
{"debug", OPT_DEBUG, '-', "Extra output"},
{"msg", OPT_MSG, '-', "Show protocol messages"},
@@ -864,7 +862,6 @@ int s_client_main(int argc, char **argv)
#endif
prog = opt_progname(argv[0]);
c_Pause = 0;
c_quiet = 0;
c_ign_eof = 0;
c_debug = 0;
@@ -1014,9 +1011,6 @@ int s_client_main(int argc, char **argv)
case OPT_NO_IGN_EOF:
c_ign_eof = 0;
break;
case OPT_PAUSE:
c_Pause = 1;
break;
case OPT_DEBUG:
c_debug = 1;
break;
@@ -1602,9 +1596,6 @@ int s_client_main(int argc, char **argv)
}
}
#endif
if (c_Pause & 0x01)
SSL_set_debug(con, 1);
if (socket_type == SOCK_DGRAM) {
sbio = BIO_new_dgram(s, BIO_NOCLOSE);
@@ -1654,7 +1645,6 @@ int s_client_main(int argc, char **argv)
}
if (c_debug) {
SSL_set_debug(con, 1);
BIO_set_callback(sbio, bio_dump_callback);
BIO_set_callback_arg(sbio, (char *)bio_c_out);
}