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

add -chain options to s_client (backrpot from HEAD)

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-12-30 16:17:29 +00:00
parent 321a9fea75
commit ede5f6cf74
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/s_client.c
View File

@ -570,11 +570,12 @@ int MAIN(int argc, char **argv)
short port=PORT; short port=PORT;
int full_log=1; int full_log=1;
char *host=SSL_HOST_NAME; char *host=SSL_HOST_NAME;
char *cert_file=NULL,*key_file=NULL; char *cert_file=NULL,*key_file=NULL,*chain_file=NULL;
int cert_format = FORMAT_PEM, key_format = FORMAT_PEM; int cert_format = FORMAT_PEM, key_format = FORMAT_PEM;
char *passarg = NULL, *pass = NULL; char *passarg = NULL, *pass = NULL;
X509 *cert = NULL; X509 *cert = NULL;
EVP_PKEY *key = NULL; EVP_PKEY *key = NULL;
STACK_OF(X509) *chain = NULL;
char *CApath=NULL,*CAfile=NULL; char *CApath=NULL,*CAfile=NULL;
int reconnect=0,badop=0,verify=SSL_VERIFY_NONE; int reconnect=0,badop=0,verify=SSL_VERIFY_NONE;
int crlf=0; int crlf=0;
@ -875,6 +876,11 @@ static char *jpake_secret = NULL;
if (--argc < 1) goto bad; if (--argc < 1) goto bad;
passarg = *(++argv); passarg = *(++argv);
} }
else if (strcmp(*argv,"-cert_chain") == 0)
{
if (--argc < 1) goto bad;
chain_file= *(++argv);
}
else if (strcmp(*argv,"-key") == 0) else if (strcmp(*argv,"-key") == 0)
{ {
if (--argc < 1) goto bad; if (--argc < 1) goto bad;
@ -1072,6 +1078,14 @@ bad:
} }
} }
if (chain_file)
{
chain = load_certs(bio_err, chain_file,FORMAT_PEM,
NULL, e, "client certificate chain");
if (!chain)
goto end;
}
if (!load_excert(&exc, bio_err)) if (!load_excert(&exc, bio_err))
goto end; goto end;
@ -1178,7 +1192,7 @@ bad:
/* goto end; */ /* goto end; */
} }
if (!set_cert_key_stuff(ctx,cert,key, NULL, build_chain)) if (!set_cert_key_stuff(ctx,cert,key,chain,build_chain))
goto end; goto end;
#ifndef OPENSSL_NO_TLSEXT #ifndef OPENSSL_NO_TLSEXT
@ -1914,6 +1928,8 @@ end:
X509_free(cert); X509_free(cert);
if (key) if (key)
EVP_PKEY_free(key); EVP_PKEY_free(key);
if (chain)
sk_X509_pop_free(chain, X509_free);
if (pass) if (pass)
OPENSSL_free(pass); OPENSSL_free(pass);
if (vpm) if (vpm)