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 9c0dbc2bf6f86a4814d2695569abbac79047c1ed..658a79d390654a8c5f414cf21f86467d601a1a34 100644 (file)
--- 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 78d90fad55d8344df59433ed7118296cd3152a61..497abf44efee260a5c18d1b39609cbef58b689b9 100644 (file)
--- 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)
                {