From: Pauli <paul.dale@oracle.com>
Date: Wed, 7 Oct 2020 02:18:36 +0000 (+1000)
Subject: null prov: fix gettable param array type.
X-Git-Tag: openssl-3.0.0-alpha8~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=994a924b3c28780b2a7ba8662a9544abcdfab8b0;p=thirdparty%2Fopenssl.git

null prov: fix gettable param array type.

Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13084)
---

diff --git a/providers/nullprov.c b/providers/nullprov.c
index 537c90b78f6..d5b4c05d932 100644
--- a/providers/nullprov.c
+++ b/providers/nullprov.c
@@ -19,15 +19,15 @@
 OSSL_provider_init_fn ossl_null_provider_init;
 
 /* Parameters we provide to the core */
-static const OSSL_ITEM null_param_types[] = {
-    { OSSL_PARAM_UTF8_PTR, OSSL_PROV_PARAM_NAME },
-    { OSSL_PARAM_UTF8_PTR, OSSL_PROV_PARAM_VERSION },
-    { OSSL_PARAM_UTF8_PTR, OSSL_PROV_PARAM_BUILDINFO },
-    { OSSL_PARAM_INTEGER, OSSL_PROV_PARAM_STATUS },
-    { 0, NULL }
+static const OSSL_PARAM null_param_types[] = {
+    OSSL_PARAM_DEFN(OSSL_PROV_PARAM_NAME, OSSL_PARAM_UTF8_PTR, NULL, 0),
+    OSSL_PARAM_DEFN(OSSL_PROV_PARAM_VERSION, OSSL_PARAM_UTF8_PTR, NULL, 0),
+    OSSL_PARAM_DEFN(OSSL_PROV_PARAM_BUILDINFO, OSSL_PARAM_UTF8_PTR, NULL, 0),
+    OSSL_PARAM_DEFN(OSSL_PROV_PARAM_STATUS, OSSL_PARAM_INTEGER, NULL, 0),
+    OSSL_PARAM_END
 };
 
-static const OSSL_ITEM *null_gettable_params(const OSSL_PROVIDER *prov)
+static const OSSL_PARAM *null_gettable_params(const OSSL_PROVIDER *prov)
 {
     return null_param_types;
 }