From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 12 Apr 2024 09:16:17 +0000 (+0200)
Subject: tls_provider_init(): Rename prov_ctx to xor_prov_ctx to clarify
X-Git-Tag: openssl-3.4.0-alpha1~569
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3de3d481b269e9831d0b9abd3598b262647ae050;p=thirdparty%2Fopenssl.git

tls_provider_init(): Rename prov_ctx to xor_prov_ctx to clarify

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/24103)
---

diff --git a/test/tls-provider.c b/test/tls-provider.c
index 18c5960a4ce..d8ec7c2dc2a 100644
--- a/test/tls-provider.c
+++ b/test/tls-provider.c
@@ -3220,12 +3220,12 @@ int tls_provider_init(const OSSL_CORE_HANDLE *handle,
     OSSL_LIB_CTX *libctx = OSSL_LIB_CTX_new_from_dispatch(handle, in);
     OSSL_FUNC_core_obj_create_fn *c_obj_create= NULL;
     OSSL_FUNC_core_obj_add_sigid_fn *c_obj_add_sigid= NULL;
-    PROV_XOR_CTX *prov_ctx = xor_newprovctx(libctx);
+    PROV_XOR_CTX *xor_prov_ctx = xor_newprovctx(libctx);
 
-    if (libctx == NULL || prov_ctx == NULL)
+    if (libctx == NULL || xor_prov_ctx == NULL)
         goto err;
 
-    *provctx = prov_ctx;
+    *provctx = xor_prov_ctx;
 
     /*
      * Randomise the group_id and code_points we're going to use to ensure we
@@ -3279,7 +3279,7 @@ int tls_provider_init(const OSSL_CORE_HANDLE *handle,
     return 1;
 
 err:
-    OPENSSL_free(prov_ctx);
+    OPENSSL_free(xor_prov_ctx);
     *provctx = NULL;
     OSSL_LIB_CTX_free(libctx);
     return 0;