Change OSSL_PARAM_UTF8_STRING_PTR to OSSL_PARAM_UTF8_PTR

In unrelated code

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

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index 9e3d5f3c1abd3d58235b2b391a194faae0b49576..05a6bfff49be85c9f6b3368924c8f2133b7c2c46 100644 (file)
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -381,8 +381,8 @@ int ossl_provider_get_params(const OSSL_PROVIDER *prov,
  * never knows.
  */
 static const OSSL_ITEM param_types[] = {
-    { OSSL_PARAM_UTF8_STRING_PTR, "openssl-version" },
-    { OSSL_PARAM_UTF8_STRING_PTR, "provider-name" },
+    { OSSL_PARAM_UTF8_PTR, "openssl-version" },
+    { OSSL_PARAM_UTF8_PTR, "provider-name" },
     { 0, NULL }
 };
 

diff --git a/test/p_test.c b/test/p_test.c
index 6c05cb05ddc6e5ee49e7f7a00763536645464cdc..9e1ba8edb3bf0100cb2aaded0bfb6ed17951dc68 100644 (file)
--- a/test/p_test.c
+++ b/test/p_test.c
@@ -53,9 +53,9 @@ static int p_get_params(const OSSL_PROVIDER *prov, OSSL_PARAM params[])
             static char *opensslv = NULL;
             static char *provname = NULL;
             static OSSL_PARAM counter_request[] = {
-                { "openssl-version", OSSL_PARAM_UTF8_STRING_PTR,
+                { "openssl-version", OSSL_PARAM_UTF8_PTR,
                   &opensslv, sizeof(&opensslv), NULL },
-                { "provider-name", OSSL_PARAM_UTF8_STRING_PTR,
+                { "provider-name", OSSL_PARAM_UTF8_PTR,
                   &provname, sizeof(&provname), NULL},
                 { NULL, 0, NULL, 0, NULL }
             };