Refactor OSSL_LIB_CTX to avoid using CRYPTO_EX_DATA

This refactors OSSL_LIB_CTX to avoid using CRYPTO_EX_DATA. The assorted
objects to be managed by OSSL_LIB_CTX are hardcoded and are initialized
eagerly rather than lazily, which avoids the need for locking on access
in most cases.

Fixes #17116.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17881)

1 files changed, 5 insertions, 87 deletions

diff --git a/test/context_internal_test.c b/test/context_internal_test.c
index 4c02f601cc..fd7518c020 100644
--- a/test/context_internal_test.c
+++ b/test/context_internal_test.c
@@ -12,103 +12,25 @@
 #include "internal/cryptlib.h"
 #include "testutil.h"
 
-/*
- * Everything between BEGIN EXAMPLE and END EXAMPLE is copied from
- * doc/internal/man3/ossl_lib_ctx_get_data.pod
- */
-
-/*
- * ======================================================================
- * BEGIN EXAMPLE
- */
-
-typedef struct foo_st {
-    int i;
-    void *data;
-} FOO;
-
-static void *foo_new(OSSL_LIB_CTX *ctx)
-{
-    FOO *ptr = OPENSSL_zalloc(sizeof(*ptr));
-    if (ptr != NULL)
-        ptr->i = 42;
-    return ptr;
-}
-static void foo_free(void *ptr)
-{
-    OPENSSL_free(ptr);
-}
-static const OSSL_LIB_CTX_METHOD foo_method = {
-    OSSL_LIB_CTX_METHOD_DEFAULT_PRIORITY,
-    foo_new,
-    foo_free
-};
-
-/*
- * END EXAMPLE
- * ======================================================================
- */
-
-static int test_context(OSSL_LIB_CTX *ctx)
-{
-    FOO *data = NULL;
-
-    return TEST_ptr(data = ossl_lib_ctx_get_data(ctx, 0, &foo_method))
-        /* OPENSSL_zalloc in foo_new() initialized it to zero */
-        && TEST_int_eq(data->i, 42);
-}
-
-static int test_app_context(void)
-{
-    OSSL_LIB_CTX *ctx = NULL;
-    int result =
-        TEST_ptr(ctx = OSSL_LIB_CTX_new())
-        && test_context(ctx);
-
-    OSSL_LIB_CTX_free(ctx);
-    return result;
-}
-
-static int test_def_context(void)
-{
-    return test_context(NULL);
-}
-
 static int test_set0_default(void)
 {
     OSSL_LIB_CTX *global = OSSL_LIB_CTX_get0_global_default();
     OSSL_LIB_CTX *local = OSSL_LIB_CTX_new();
     OSSL_LIB_CTX *prev;
     int testresult = 0;
-    FOO *data = NULL;
 
     if (!TEST_ptr(global)
             || !TEST_ptr(local)
-            || !TEST_ptr_eq(global, OSSL_LIB_CTX_set0_default(NULL))
-            || !TEST_ptr(data = ossl_lib_ctx_get_data(local, 0, &foo_method)))
-        goto err;
-
-    /* Set local "i" value to 43. Global "i" should be 42 */
-    data->i++;
-    if (!TEST_int_eq(data->i, 43))
-        goto err;
-
-    /* The default context should still be the "global" default */
-    if (!TEST_ptr(data = ossl_lib_ctx_get_data(NULL, 0, &foo_method))
-            || !TEST_int_eq(data->i, 42))
+            || !TEST_ptr_eq(global, OSSL_LIB_CTX_set0_default(NULL)))
         goto err;
 
     /* Check we can change the local default context */
     if (!TEST_ptr(prev = OSSL_LIB_CTX_set0_default(local))
-            || !TEST_ptr_eq(global, prev)
-            || !TEST_ptr(data = ossl_lib_ctx_get_data(NULL, 0, &foo_method))
-            || !TEST_int_eq(data->i, 43))
+            || !TEST_ptr_eq(global, prev))
         goto err;
 
     /* Calling OSSL_LIB_CTX_set0_default() with a NULL should be a no-op */
-    if (!TEST_ptr_eq(local, OSSL_LIB_CTX_set0_default(NULL))
-            || !TEST_ptr(data = ossl_lib_ctx_get_data(NULL, 0, &foo_method))
-            || !TEST_int_eq(data->i, 43))
+    if (!TEST_ptr_eq(local, OSSL_LIB_CTX_set0_default(NULL)))
         goto err;
 
     /* Global default should be unchanged */
@@ -116,10 +38,8 @@ static int test_set0_default(void)
         goto err;
 
     /* Check we can swap back to the global default */
-   if (!TEST_ptr(prev = OSSL_LIB_CTX_set0_default(global))
-            || !TEST_ptr_eq(local, prev)
-            || !TEST_ptr(data = ossl_lib_ctx_get_data(NULL, 0, &foo_method))
-            || !TEST_int_eq(data->i, 42))
+    if (!TEST_ptr(prev = OSSL_LIB_CTX_set0_default(global))
+            || !TEST_ptr_eq(local, prev))
         goto err;
 
     testresult = 1;
@@ -130,8 +50,6 @@ static int test_set0_default(void)
 
 int setup_tests(void)
 {
-    ADD_TEST(test_app_context);
-    ADD_TEST(test_def_context);
     ADD_TEST(test_set0_default);
     return 1;
 }