mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-19 06:53:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix s_client crash

Browse Source 
The 'http proxy' commit broke s_client default host/port value.
Thanks to Matt for the simplest fix.

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Rich Salz 2015-05-25 11:13:28 -04:00 committed by Rich Salz
parent 81fc390fd9
commit fc0eb00bca
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/s_client.c
View File

@ -635,8 +635,8 @@ int s_client_main(int argc, char **argv)
char *CApath = NULL, *CAfile = NULL, *cbuf = NULL, *sbuf = NULL;
char *mbuf = NULL, *proxystr = NULL, *connectstr = NULL;
char *cert_file = NULL, *key_file = NULL, *chain_file = NULL, *prog;
char *chCApath = NULL, *chCAfile = NULL, *host = SSL_HOST_NAME, *inrand =
NULL;
char *chCApath = NULL, *chCAfile = NULL, *host = SSL_HOST_NAME;
char *inrand = NULL;
char *passarg = NULL, *pass = NULL, *vfyCApath = NULL, *vfyCAfile = NULL;
char *sess_in = NULL, *sess_out = NULL, *crl_file = NULL, *p;
char *jpake_secret = NULL, *xmpphost = NULL;
@ -1067,7 +1067,8 @@ int s_client_main(int argc, char **argv)
if (!extract_host_port(proxystr, &host, NULL, &port))
goto end;
}
else if (!extract_host_port(connectstr, &host, NULL, &port))
else if (connectstr != NULL
&& !extract_host_port(connectstr, &host, NULL, &port))
goto end;
if (unix_path && (socket_type != SOCK_STREAM)) {