]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Remove internal-only DRBG_STATUS enum
authorFrederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk>
Tue, 30 Jun 2026 15:22:11 +0000 (17:22 +0200)
committerTomas Mraz <tomas@openssl.foundation>
Fri, 3 Jul 2026 19:28:43 +0000 (21:28 +0200)
Changed internal prov_drbg_st member variable from DRBG_STATUS
to int to reflect how it was actually used.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
MergeDate: Fri Jul  3 19:29:47 2026
(Merged from https://github.com/openssl/openssl/pull/31745)

providers/implementations/include/prov/drbg.h
test/drbgtest.c

index c93acba96e15ac88898fac572b06a7c18df21a29..84494a7e0ad450a3d8b6b0c733d4b9e586cf5f1d 100644 (file)
 
 typedef struct prov_drbg_st PROV_DRBG;
 
-/* DRBG status values */
-typedef enum drbg_status_e {
-    DRBG_UNINITIALISED,
-    DRBG_READY,
-    DRBG_ERROR
-} DRBG_STATUS;
-
 /*
  * The state of all types of DRBGs.
  */
@@ -149,7 +142,11 @@ struct prov_drbg_st {
     unsigned int parent_reseed_counter;
 
     size_t seedlen;
-    DRBG_STATUS state;
+    /*
+     * state is one of: EVP_RAND_STATE_UNINITIALISED, EVP_RAND_STATE_ERROR,
+     * EVP_RAND_STATE_READY.
+     */
+    int state;
 
     /* DRBG specific data */
     void *data;
index 91060cf60a92383ca332d062725c5cb4787865c5..0828ebf7b55661e8287f6ae328b8d3919943238e 100644 (file)
@@ -182,7 +182,7 @@ static int test_drbg_reseed(int expect_success,
     time_t reseed_when)
 {
     time_t before_reseed, after_reseed;
-    int expected_state = (expect_success ? DRBG_READY : DRBG_ERROR);
+    int expected_state = (expect_success ? EVP_RAND_STATE_READY : EVP_RAND_STATE_ERROR);
     unsigned int primary_reseed, public_reseed, private_reseed;
     unsigned char dummy[RANDOM_SIZE];