capture s2n_supports_custom_rand

aws · Nov 9, 2024 · 45885d4 · 45885d4
1 parent f35ec75
commit 45885d4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/tests/unit/s2n_random_test.c b/tests/unit/s2n_random_test.c
@@ -795,7 +795,7 @@ static int s2n_random_rand_bytes_after_cleanup_cb(struct random_test_case *test_
 static int s2n_random_rand_bytes_before_init(struct random_test_case *test_case)
 {
 #if S2N_LIBCRYPTO_SUPPORTS_ENGINE
-    if (!s2n_libcrypto_is_boringssl() && !s2n_libcrypto_is_libressl() && !s2n_libcrypto_is_awslc() && !s2n_libcrypto_is_fips()) {
+    if (s2n_supports_custom_rand()) {
         /* Calling RAND_bytes will set a global random method */
         unsigned char rndbytes[16] = { 0 };
         EXPECT_EQUAL(RAND_bytes(rndbytes, sizeof(rndbytes)), 1);

diff --git a/utils/s2n_random.c b/utils/s2n_random.c
@@ -554,14 +554,19 @@ static int s2n_rand_init_cb_impl(void)
     return S2N_SUCCESS;
 }
 
+bool s2n_supports_custom_rand()
+{
+    return !s2n_libcrypto_is_boringssl() && !s2n_libcrypto_is_libressl() && !s2n_libcrypto_is_awslc() && !s2n_libcrypto_is_fips();
+}
+
 S2N_RESULT s2n_rand_init(void)
 {
     RESULT_ENSURE(s2n_rand_init_cb() >= S2N_SUCCESS, S2N_ERR_CANCELLED);
 
     RESULT_GUARD(s2n_ensure_initialized_drbgs());
 
 #if S2N_LIBCRYPTO_SUPPORTS_ENGINE
-    if (!s2n_libcrypto_is_boringssl() && !s2n_libcrypto_is_libressl() && !s2n_libcrypto_is_awslc() && !s2n_libcrypto_is_fips()) {
+    if (s2n_supports_custom_rand()) {
         /* Unset any existing random engine */
         RESULT_GUARD_OSSL(RAND_set_rand_engine(NULL), S2N_ERR_OPEN_RANDOM);
 
@@ -607,7 +612,7 @@ S2N_RESULT s2n_rand_cleanup(void)
     RESULT_ENSURE(s2n_rand_cleanup_cb() >= S2N_SUCCESS, S2N_ERR_CANCELLED);
 
 #if S2N_LIBCRYPTO_SUPPORTS_ENGINE
-    if (!s2n_libcrypto_is_boringssl() && !s2n_libcrypto_is_libressl() && !s2n_libcrypto_is_awslc() && !s2n_libcrypto_is_fips()) {
+    if (s2n_supports_custom_rand()) {
         /* Cleanup our rand ENGINE in libcrypto */
         ENGINE *rand_engine = ENGINE_by_id(s2n_rand_engine_id);
         if (rand_engine) {

diff --git a/utils/s2n_random.h b/utils/s2n_random.h
@@ -28,6 +28,7 @@ struct s2n_rand_device {
     dev_t rdev;
 };
 
+bool s2n_supports_custom_rand();
 S2N_RESULT s2n_rand_init(void);
 S2N_RESULT s2n_rand_cleanup(void);
 S2N_RESULT s2n_get_seed_entropy(struct s2n_blob *blob);