From: Pauli <ppzgs1@gmail.com>
Date: Tue, 3 Jun 2025 03:23:24 +0000 (+1000)
Subject: cipher: use the new name/type code generator for ciphers
X-Git-Tag: openssl-3.6.0-alpha1~640
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04e969d1f67b441c9f9474918c60085d20090ae8;p=thirdparty%2Fopenssl.git

cipher: use the new name/type code generator for ciphers

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

diff --git a/providers/implementations/ciphers/ciphercommon.c.in b/providers/implementations/ciphers/ciphercommon.c.in
index 782b7f08231..7744d00123a 100644
--- a/providers/implementations/ciphers/ciphercommon.c.in
+++ b/providers/implementations/ciphers/ciphercommon.c.in
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 {-
-use OpenSSL::paramnames qw(produce_decoder);
+use OpenSSL::paramnames qw(produce_param_list);
 -}
 
 /*
@@ -157,18 +157,22 @@ CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(ossl_cipher_var_keylen)
 /*-
  * AEAD cipher functions for OSSL_PARAM gettables and settables
  */
-static const OSSL_PARAM cipher_aead_known_gettable_ctx_params[] = {
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_IVLEN, NULL),
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TAGLEN, NULL),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_IV, NULL, 0),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_UPDATED_IV, NULL, 0),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0),
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN, NULL, 0),
-    OSSL_PARAM_uint(OSSL_CIPHER_PARAM_AEAD_IV_GENERATED, NULL),
-    OSSL_PARAM_END
-};
+
+/* Machine generated by util/perl/OpenSSL/paramnames.pm */
+{- produce_param_list('static', 'cipher_aead_known_gettable_ctx_params',
+                      '', 'ossl_cipher_aead_get_ctx_params_find_pidx',
+                      (['CIPHER_PARAM_KEYLEN',                  'size_t'],
+                       ['CIPHER_PARAM_IVLEN',                   'size_t'],
+                       ['CIPHER_PARAM_AEAD_TAGLEN',             'size_t'],
+                       ['CIPHER_PARAM_IV',                      'octet_string'],
+                       ['CIPHER_PARAM_UPDATED_IV',              'octet_string'],
+                       ['CIPHER_PARAM_AEAD_TAG',                'octet_string'],
+                       ['CIPHER_PARAM_AEAD_TLS1_AAD_PAD',       'size_t'],
+                       ['CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN',    'octet_string'],
+                       ['CIPHER_PARAM_AEAD_IV_GENERATED',       'uint'],
+                      )); -}
+/* End of machine generated */
+
 const OSSL_PARAM *ossl_cipher_aead_gettable_ctx_params(
         ossl_unused void *cctx, ossl_unused void *provctx
     )
@@ -177,27 +181,16 @@ const OSSL_PARAM *ossl_cipher_aead_gettable_ctx_params(
 }
 
 /* Machine generated by util/perl/OpenSSL/paramnames.pm */
-{- produce_decoder('ossl_cipher_aead_get_ctx_params_find_pidx',
-                   ('CIPHER_PARAM_KEYLEN',
-                    'CIPHER_PARAM_IVLEN',
-                    'CIPHER_PARAM_AEAD_TAGLEN',
-                    'CIPHER_PARAM_IV',
-                    'CIPHER_PARAM_UPDATED_IV',
-                    'CIPHER_PARAM_AEAD_TAG',
-                    'CIPHER_PARAM_AEAD_TLS1_AAD_PAD',
-                    'CIPHER_PARAM_AEAD_TLS1_GET_IV_GEN',
-                    'CIPHER_PARAM_AEAD_IV_GENERATED',
-                   )); -}
+{- produce_param_list('static', 'cipher_aead_known_settable_ctx_params',
+                      '', 'ossl_cipher_aead_set_ctx_params_find_pidx',
+                      (['CIPHER_PARAM_AEAD_IVLEN',              'size_t'],
+                       ['CIPHER_PARAM_AEAD_TAG',                'octet_string'],
+                       ['CIPHER_PARAM_AEAD_TLS1_AAD',           'octet_string'],
+                       ['CIPHER_PARAM_AEAD_TLS1_IV_FIXED',      'octet_string'],
+                       ['CIPHER_PARAM_AEAD_TLS1_SET_IV_INV',    'octet_string'],
+                      )); -}
 /* End of machine generated */
 
-static const OSSL_PARAM cipher_aead_known_settable_ctx_params[] = {
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_IVLEN, NULL),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TAG, NULL, 0),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD, NULL, 0),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_IV_FIXED, NULL, 0),
-    OSSL_PARAM_octet_string(OSSL_CIPHER_PARAM_AEAD_TLS1_SET_IV_INV, NULL, 0),
-    OSSL_PARAM_END
-};
 const OSSL_PARAM *ossl_cipher_aead_settable_ctx_params(
         ossl_unused void *cctx, ossl_unused void *provctx
     )
@@ -205,16 +198,6 @@ const OSSL_PARAM *ossl_cipher_aead_settable_ctx_params(
     return cipher_aead_known_settable_ctx_params;
 }
 
-/* Machine generated by util/perl/OpenSSL/paramnames.pm */
-{- produce_decoder('ossl_cipher_aead_set_ctx_params_find_pidx',
-                   ('CIPHER_PARAM_AEAD_IVLEN',
-                    'CIPHER_PARAM_AEAD_TAG',
-                    'CIPHER_PARAM_AEAD_TLS1_AAD',
-                    'CIPHER_PARAM_AEAD_TLS1_IV_FIXED',
-                    'CIPHER_PARAM_AEAD_TLS1_SET_IV_INV',
-                   )); -}
-/* End of machine generated */
-
 void ossl_cipher_generic_reset_ctx(PROV_CIPHER_CTX *ctx)
 {
     if (ctx != NULL && ctx->alloced) {