From: Richard Levitte <levitte@openssl.org>
Date: Tue, 16 Jul 2002 06:52:03 +0000 (+0000)
Subject: Set up the engine before doing anything random-related, since engine randomness
X-Git-Tag: OpenSSL_0_9_6e~26^2~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cead7f36dab1afcf681479d2345919f92c2efe8a;p=oweals%2Fopenssl.git

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>
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 9c0dbc2bf6..658a79d390 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -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)
 		{
diff --git a/apps/s_server.c b/apps/s_server.c
index 65525572e2..85d3b30ec1 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -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)
 		{