Set up the engine before doing anything random-related, since engine randomness
authorRichard Levitte <levitte@openssl.org>
Tue, 16 Jul 2002 06:52:03 +0000 (06:52 +0000)
committerRichard Levitte <levitte@openssl.org>
Tue, 16 Jul 2002 06:52:03 +0000 (06:52 +0000)
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>

apps/s_client.c
apps/s_server.c

index 9c0dbc2..658a79d 100644 (file)
@@ -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)
                {
index 6552557..85d3b30 100644 (file)
@@ -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)
                {