diff options
| author | Karol Brzuskiewicz <kabr@arista.com> | 2024-06-10 01:48:31 -0700 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-06-24 19:02:43 +0200 |
| commit | 42a8ef844e5fca55abb608beb62695abe80c6b6d (patch) | |
| tree | be9dd7d72cea36de3b101eb4c0ccdd756ac53c90 /test | |
| parent | d38f62ea118170fc40e10f6f95b180cccbaa7581 (diff) | |
| download | openssl-42a8ef844e5fca55abb608beb62695abe80c6b6d.zip openssl-42a8ef844e5fca55abb608beb62695abe80c6b6d.tar.gz openssl-42a8ef844e5fca55abb608beb62695abe80c6b6d.tar.bz2 | |
Fix usage of deallocated EVP_RAND_CTX after execution of FIPS on-demand self tests
Once RNG is used, triggering FIPS on-demand self tests (via
OSSL_PROVIDER_self_test() API) crashes the application. This happens because the
RNG context is stored before self tests, and restored after their execution.
In the meantime - before context restoration - RAND_set0_private() function is
called, which decrements the stored RNG context reference counter and frees it.
To resolve the issue, the stored RNG context refcount has been incremented via
the EVP_RAND_CTX_up_ref() API to avoid its deallocation during the RNG context
switch performed by the self test function.
The provider_status_test test has been updated to reproduce the issue as
a regression test.
Signed-off-by: Karol Brzuskiewicz <kabr@arista.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24599)
Diffstat (limited to 'test')
| -rw-r--r-- | test/provider_status_test.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/test/provider_status_test.c b/test/provider_status_test.c index 551277c..362ae38 100644 --- a/test/provider_status_test.c +++ b/test/provider_status_test.c @@ -14,6 +14,7 @@ #include <openssl/core_names.h> #include <openssl/self_test.h> #include <openssl/evp.h> +#include <openssl/rsa.h> #include "testutil.h" typedef enum OPTION_choice { @@ -147,6 +148,8 @@ static int test_provider_status(void) OSSL_PROVIDER *prov = NULL; OSSL_PARAM params[2]; EVP_MD *fetch = NULL; + EVP_PKEY_CTX *pctx = NULL; + EVP_PKEY *pkey = NULL; if (!TEST_ptr(prov = OSSL_PROVIDER_load(libctx, provider_name))) goto err; @@ -163,6 +166,16 @@ static int test_provider_status(void) goto err; EVP_MD_free(fetch); fetch = NULL; + /* Use RNG before triggering on-demand self tests */ + if (!TEST_ptr((pctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA", NULL))) + || !TEST_int_gt(EVP_PKEY_keygen_init(pctx), 0) + || !TEST_int_gt(EVP_PKEY_CTX_set_rsa_keygen_bits(pctx, 2048), 0) + || !TEST_int_gt(EVP_PKEY_keygen(pctx, &pkey), 0)) + goto err; + EVP_PKEY_free(pkey); + EVP_PKEY_CTX_free(pctx); + pkey = NULL; + pctx = NULL; /* Test that the provider self test is ok */ self_test_args.count = 0; |