CTR, HASH and HMAC DRBGs in provider

[openssl.git] / providers / implementations / rands / test_rng.c

diff --git a/providers/implementations/rands/test_rng.c b/providers/implementations/rands/test_rng.c
index 41e83ab4851249c2006a77fe3cb1d2ba98c3f43b..86fb979936ce7a4922b84dd5cad4114c7f675ba6 100644 (file)
--- a/providers/implementations/rands/test_rng.c
+++ b/providers/implementations/rands/test_rng.c
@@ -36,7 +36,7 @@ typedef struct {
     unsigned int strength;
 } PROV_TEST_RNG;
 
-static int test_rng_new(PROV_DRBG *ctx, int secure)
+static int test_rng_new(PROV_DRBG *ctx)
 {
     PROV_TEST_RNG *t;
 
@@ -50,17 +50,9 @@ static int test_rng_new(PROV_DRBG *ctx, int secure)
     ctx->max_perslen = INT_MAX;
     ctx->max_adinlen = INT_MAX;
     ctx->max_request = INT_MAX;
-    ctx->strength = 1024;
     return 1;
 }
 
-static void *test_rng_new_wrapper(void *provctx, int secure, void *parent,
-                                   const OSSL_DISPATCH *parent_dispatch)
-{
-    return prov_rand_drbg_new(provctx, secure, parent, parent_dispatch,
-                              &test_rng_new);
-}
-
 static void test_rng_free(void *vdrbg)
 {
     PROV_DRBG *drbg = (PROV_DRBG *)vdrbg;
@@ -111,7 +103,7 @@ static int test_rng_uninstantiate(PROV_DRBG *drbg)
     PROV_TEST_RNG *t = (PROV_TEST_RNG *)drbg->data;
 
     t->entropy_pos = 0;
-    return 1;
+    return PROV_DRBG_uninstantiate(drbg);
 }
 
 static int test_rng_uninstantiate_wrapper(void *vdrbg)
@@ -169,15 +161,6 @@ static int test_rng_reseed_wrapper(void *vdrbg, int prediction_resistance,
     return test_rng_reseed((PROV_DRBG *)vdrbg, ent, ent_len, adin, adin_len);
 }
 
-static void *test_rng_new_wrapper(void *provctx, void *parent,
-                                   const OSSL_DISPATCH *parent_dispatch)
-{
-    return prov_rand_drbg_new(provctx, parent, parent_dispatch,
-                              &test_rng_new, &test_rng_instantiate,
-                              &test_rng_uninstantiate, &test_rng_reseed,
-                              &test_rng_generate);
-}
-
 static size_t test_rng_nonce(void *vdrbg, unsigned char *out,
                              unsigned int strength, size_t min_noncelen,
                              size_t max_noncelen)
@@ -307,6 +290,15 @@ static int test_rng_verify_zeroization(void *vdrbg)
     return 1;
 }
 
+static void *test_rng_new_wrapper(void *provctx, void *parent,
+                                   const OSSL_DISPATCH *parent_dispatch)
+{
+    return prov_rand_drbg_new(provctx, parent, parent_dispatch,
+                              &test_rng_new, &test_rng_instantiate,
+                              &test_rng_uninstantiate, &test_rng_reseed,
+                              &test_rng_generate);
+}
+
 const OSSL_DISPATCH test_rng_functions[] = {
     { OSSL_FUNC_RAND_NEWCTX, (void(*)(void))test_rng_new_wrapper },
     { OSSL_FUNC_RAND_FREECTX, (void(*)(void))test_rng_free },