Commit 50d1c3fd authored by Richard Levitte's avatar Richard Levitte
Browse files

Set up the engine before doing anything random-related, since engine randomness 

is only used for seeding and doing it in the wrong order will mean seeding
is done before the engine randomness is hooked in.
Notified by Frederic DONNAT <frederic.donnat@zencod.com>
parent ed712101

apps/s_client.c

+5 −5
Original line number Diff line number Diff line
@@ -433,6 +433,11 @@ bad: 
		goto end;

		}



	OpenSSL_add_ssl_algorithms();

	SSL_load_error_strings();



        e = setup_engine(bio_err, engine_id, 1);



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

		&& !RAND_status())

		{
@@ -455,11 +460,6 @@ bad: 
			}

		}



	OpenSSL_add_ssl_algorithms();

	SSL_load_error_strings();



        e = setup_engine(bio_err, engine_id, 1);



	ctx=SSL_CTX_new(meth);

	if (ctx == NULL)

		{

apps/s_server.c

+5 −5
Original line number Diff line number Diff line
@@ -683,6 +683,11 @@ bad: 
		goto end;

		}



	SSL_load_error_strings();

	OpenSSL_add_ssl_algorithms();



        e = setup_engine(bio_err, engine_id, 1);



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

		&& !RAND_status())

		{
@@ -715,11 +720,6 @@ bad: 
		s_dkey_file=NULL;

		}



	SSL_load_error_strings();

	OpenSSL_add_ssl_algorithms();



        e = setup_engine(bio_err, engine_id, 1);



	ctx=SSL_CTX_new(meth);

	if (ctx == NULL)

		{