From e2146e120f5bab21dcedfb34741141897f80e1ee Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 11 Mar 2019 21:49:54 +0100 Subject: [PATCH] Change OSSL_PARAM_UTF8_STRING_PTR to OSSL_PARAM_UTF8_PTR In unrelated code Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/8451) --- crypto/provider_core.c | 4 ++-- test/p_test.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/provider_core.c b/crypto/provider_core.c index 9e3d5f3c1a..05a6bfff49 100644 --- 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 6c05cb05dd..9e1ba8edb3 100644 --- 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 } }; -- 2.34.1