Commit abbc186b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix s_client so it works without a certificate again.

parent de6859e4

apps/s_cb.c

+2 −0
Original line number Diff line number Diff line
@@ -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");

apps/s_client.c

+21 −10
Original line number Diff line number Diff line
@@ -482,6 +482,11 @@ bad: 
	if (key_file == NULL)

		key_file = cert_file;





	if (key_file)



		{



		key = load_key(bio_err, key_file, key_format, 0, pass, e,

			       "client certificate private key file");

		if (!key)
@@ -490,6 +495,11 @@ bad: 
			goto end;

			}



		}



	if (cert_file)



		{

		cert = load_cert(bio_err,cert_file,cert_format,

				NULL, e, "client certificate file");
@@ -498,6 +508,7 @@ bad: 
			ERR_print_errors(bio_err);

			goto end;

			}

		}



	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL

		&& !RAND_status())