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
Show Stats 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);
}

3
apps/s_server.c
View File

@ -2098,7 +2098,6 @@ static int sv_body(char *hostname, int s, int stype, unsigned char *context)
/* SSL_set_fd(con,s); */
if (s_debug) {
SSL_set_debug(con, 1);
BIO_set_callback(SSL_get_rbio(con), bio_dump_callback);
BIO_set_callback_arg(SSL_get_rbio(con), (char *)bio_s_out);
}
@ -2651,7 +2650,6 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context)
#endif
if (s_debug) {
SSL_set_debug(con, 1);
BIO_set_callback(SSL_get_rbio(con), bio_dump_callback);
BIO_set_callback_arg(SSL_get_rbio(con), (char *)bio_s_out);
}
@ -3013,7 +3011,6 @@ static int rev_body(char *hostname, int s, int stype, unsigned char *context)
#endif
if (s_debug) {
SSL_set_debug(con, 1);
BIO_set_callback(SSL_get_rbio(con), bio_dump_callback);
BIO_set_callback_arg(SSL_get_rbio(con), (char *)bio_s_out);
}

5
doc/apps/s_client.pod
View File

@ -52,7 +52,6 @@ B<openssl> B<s_client>
[B<-verify_name name>]
[B<-x509_strict>]
[B<-reconnect>]
[B<-pause>]
[B<-showcerts>]
[B<-debug>]
[B<-msg>]
@ -226,10 +225,6 @@ L<verify(1)> manual page for details.
reconnects to the same server 5 times using the same session ID, this can
be used as a test that session caching is working.
=item B<-pause>
pauses 1 second between each read and write call.
=item B<-showcerts>
display the whole server certificate chain: normally only the server

1
include/openssl/ssl.h
View File

@ -1810,7 +1810,6 @@ void SSL_set_not_resumable_session_callback(SSL *ssl,
int
is_forward_secure));
void SSL_set_debug(SSL *s, int debug);
__owur int SSL_cache_hit(SSL *s);
__owur int SSL_is_server(SSL *s);

7
ssl/ssl_lib.c
View File

@ -3052,8 +3052,6 @@ SSL *SSL_dup(SSL *s)
SSL_set_info_callback(ret, SSL_get_info_callback(s));
ret->debug = s->debug;
/* copy app data, a little dangerous perhaps */
if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_SSL, &ret->ex_data, &s->ex_data))
goto err;
@ -3665,11 +3663,6 @@ int ssl_handshake_hash(SSL *s, unsigned char *out, int outlen)
return ret;
}
void SSL_set_debug(SSL *s, int debug)
{
s->debug = debug;
}
int SSL_cache_hit(SSL *s)
{
return s->hit;

5
ssl/ssl_locl.h
View File

@ -1065,11 +1065,6 @@ struct ssl_st {
unsigned int max_psk_len);
# endif
SSL_CTX *ctx;
/*
* set this flag to 1 and a sleep(1) is put into all SSL_read() and
* SSL_write() calls, good for nbio debuging :-)
*/
int debug;
/* extra application data */
long verify_result;
CRYPTO_EX_DATA ex_data;

2
util/ssleay.num
View File

@ -295,7 +295,7 @@ SSL_srp_server_param_with_username 336 1_1_0 EXIST:!VMS:FUNCTION:SRP
SSL_srp_server_param_with_un 336 1_1_0 EXIST:VMS:FUNCTION:SRP
SRP_have_to_put_srp_username 337 1_1_0 NOEXIST::FUNCTION:
SSL_SRP_CTX_free 338 1_1_0 EXIST::FUNCTION:SRP
SSL_set_debug 339 1_1_0 EXIST::FUNCTION:
SSL_set_debug 339 1_1_0 NOEXIST::FUNCTION:
SSL_SESSION_get0_peer 340 1_1_0 EXIST::FUNCTION:
TLSv1_2_client_method 341 1_1_0 EXIST::FUNCTION:
SSL_SESSION_set1_id_context 342 1_1_0 EXIST::FUNCTION: