openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix s_client so it works without a certificate again.

This commit is contained in:
Dr. Stephen Henson 2004-12-13 18:02:23 +00:00
parent de6859e442
commit abbc186bd2
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/s_cb.c
View File

@ -231,6 +231,8 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key)
{
if (cert == NULL)
return 1;
if (SSL_CTX_use_certificate(ctx,cert) <= 0)
{
BIO_printf(bio_err,"error setting certificate\n");

31
apps/s_client.c
View File

@ -482,21 +482,32 @@ bad:
if (key_file == NULL)
key_file = cert_file;
key = load_key(bio_err, key_file, key_format, 0, pass, e,
"client certificate private key file");
if (!key)
if (key_file)
{
ERR_print_errors(bio_err);
goto end;
key = load_key(bio_err, key_file, key_format, 0, pass, e,
"client certificate private key file");
if (!key)
{
ERR_print_errors(bio_err);
goto end;
}
}
cert = load_cert(bio_err,cert_file,cert_format,
NULL, e, "client certificate file");
if (cert_file)
if (!cert)
{
ERR_print_errors(bio_err);
goto end;
cert = load_cert(bio_err,cert_file,cert_format,
NULL, e, "client certificate file");
if (!cert)
{
ERR_print_errors(bio_err);
goto end;
}
}
if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL