]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
update set_ctx_param DRBG calls to return 1 for a NULL params
authorPauli <ppzgs1@gmail.com>
Wed, 10 Mar 2021 08:38:04 +0000 (18:38 +1000)
committerPauli <ppzgs1@gmail.com>
Thu, 11 Mar 2021 22:27:30 +0000 (08:27 +1000)
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14383)

providers/implementations/rands/drbg.c
providers/implementations/rands/test_rng.c

index a05c9397c8b5736c37b8059061de6476d18e5108..461d641273d17e437967db11c2d65757b58bd71a 100644 (file)
@@ -915,6 +915,9 @@ int ossl_drbg_set_ctx_params(PROV_DRBG *drbg, const OSSL_PARAM params[])
 {
     const OSSL_PARAM *p;
 
+    if (params == NULL)
+        return 1;
+
     p = OSSL_PARAM_locate_const(params, OSSL_DRBG_PARAM_RESEED_REQUESTS);
     if (p != NULL && !OSSL_PARAM_get_uint(p, &drbg->reseed_interval))
         return 0;
index 1335de8681d047b4067fb13a14ca1bd0f0dd8962..bdad7ac9ac2362edcd6d3995c4f1d615fc225d0e 100644 (file)
@@ -183,6 +183,9 @@ static int test_rng_set_ctx_params(void *vtest, const OSSL_PARAM params[])
     void *ptr = NULL;
     size_t size = 0;
 
+    if (params == NULL)
+        return 1;
+
     p = OSSL_PARAM_locate_const(params, OSSL_RAND_PARAM_STRENGTH);
     if (p != NULL && !OSSL_PARAM_get_uint(p, &t->strength))
         return 0;