]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
null prov: fix gettable param array type.
authorPauli <paul.dale@oracle.com>
Wed, 7 Oct 2020 02:18:36 +0000 (12:18 +1000)
committerPauli <paul.dale@oracle.com>
Fri, 16 Oct 2020 00:33:38 +0000 (10:33 +1000)
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/13084)

providers/nullprov.c

index 537c90b78f66193022fea4d03eaa5f64c297e431..d5b4c05d9321b10c6b30298a9cb6bb3f7338a029 100644 (file)
 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;
 }