Remove unnecessary DRBG_RESEED state

The DRBG_RESEED state plays an analogue role to the |reseed_required_flag| in
Appendix B.3.4 of [NIST SP 800-90A Rev. 1]. The latter is a local variable,
the scope of which is limited to the RAND_DRBG_generate() function. Hence there
is no need for a DRBG_RESEED state outside of the generate function. This state
was removed and replaced by a local variable |reseed_required|.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4328)

diff --git a/crypto/rand/drbg_lib.c b/crypto/rand/drbg_lib.c
index eef5e11cc5986f6949699421278f9bf055a3b3b3..0042a931b0a1291ebf64bc29f88faa896ef01487 100644 (file)
--- a/crypto/rand/drbg_lib.c
+++ b/crypto/rand/drbg_lib.c
@@ -356,6 +356,8 @@ int RAND_DRBG_generate(RAND_DRBG *drbg, unsigned char *out, size_t outlen,
                        int prediction_resistance,
                        const unsigned char *adin, size_t adinlen)
 {
                        int prediction_resistance,
                        const unsigned char *adin, size_t adinlen)
 {

+    int reseed_required = 0;
+

     if (drbg->state != DRBG_READY) {
         /* try to recover from previous errors */
         rand_drbg_restart(drbg, NULL, 0, 0);
     if (drbg->state != DRBG_READY) {
         /* try to recover from previous errors */
         rand_drbg_restart(drbg, NULL, 0, 0);


@@ -381,13 +383,13 @@ int RAND_DRBG_generate(RAND_DRBG *drbg, unsigned char *out, size_t outlen,
 
     if (drbg->fork_count != rand_fork_count) {
         drbg->fork_count = rand_fork_count;
 
     if (drbg->fork_count != rand_fork_count) {
         drbg->fork_count = rand_fork_count;

-        drbg->state = DRBG_RESEED;
+        reseed_required = 1;

     }
 
     if (drbg->reseed_counter >= drbg->reseed_interval)
     }
 
     if (drbg->reseed_counter >= drbg->reseed_interval)

-        drbg->state = DRBG_RESEED;
+        reseed_required = 1;

 
 

-    if (drbg->state == DRBG_RESEED || prediction_resistance) {
+    if (reseed_required || prediction_resistance) {

         if (!RAND_DRBG_reseed(drbg, adin, adinlen)) {
             RANDerr(RAND_F_RAND_DRBG_GENERATE, RAND_R_RESEED_ERROR);
             return 0;
         if (!RAND_DRBG_reseed(drbg, adin, adinlen)) {
             RANDerr(RAND_F_RAND_DRBG_GENERATE, RAND_R_RESEED_ERROR);
             return 0;


@@ -402,10 +404,8 @@ int RAND_DRBG_generate(RAND_DRBG *drbg, unsigned char *out, size_t outlen,
         return 0;
     }
 
         return 0;
     }
 

-    if (drbg->reseed_counter >= drbg->reseed_interval)
-        drbg->state = DRBG_RESEED;
-    else
-        drbg->reseed_counter++;
+    drbg->reseed_counter++;
+

     return 1;
 }
 
     return 1;
 }
 

diff --git a/crypto/rand/rand_lcl.h b/crypto/rand/rand_lcl.h
index 10a6f00a2ddc2d381abf65a940a70a6ee9317704..5e319d8c99fa43382f7ea3b3e04c33edb95d100b 100644 (file)
--- a/crypto/rand/rand_lcl.h
+++ b/crypto/rand/rand_lcl.h
@@ -41,7 +41,6 @@
 typedef enum drbg_status_e {
     DRBG_UNINITIALISED,
     DRBG_READY,
 typedef enum drbg_status_e {
     DRBG_UNINITIALISED,
     DRBG_READY,

-    DRBG_RESEED,

     DRBG_ERROR
 } DRBG_STATUS;
 
     DRBG_ERROR
 } DRBG_STATUS;