chacha20_poly1305: use the new name/type code generator

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/cipher_chacha20_poly1305.c.in b/providers/implementations/ciphers/cipher_chacha20_poly1305.c.in
index 8e32bf3fd9a7be064b8e57a06995bab5e638eb68..60d0a044f94dc59fe7cf43760a4353516292e2b1 100644 (file)
--- a/providers/implementations/ciphers/cipher_chacha20_poly1305.c.in
+++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.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);
 -}
 
 /* Dispatch functions for chacha20_poly1305 cipher */
@@ -160,38 +160,35 @@ static int chacha20_poly1305_get_ctx_params(void *vctx, OSSL_PARAM params[])
     return 1;
 }
 
+
 /* Machine generated by util/perl/OpenSSL/paramnames.pm */
-static {- produce_decoder('chacha20_poly1305_get_ctx_params_find_pidx',
-                   ('CIPHER_PARAM_KEYLEN',
-                    'CIPHER_PARAM_IVLEN',
-                    'CIPHER_PARAM_AEAD_TAGLEN',
-                    'CIPHER_PARAM_AEAD_TAG',
-                    'CIPHER_PARAM_AEAD_TLS1_AAD_PAD',
-                   )); -}
+{- produce_param_list('static', 'chacha20_poly1305_known_gettable_ctx_params',
+                      'static', 'chacha20_poly1305_get_ctx_params_find_pidx',
+                      (['CIPHER_PARAM_KEYLEN',                  'size_t'],
+                       ['CIPHER_PARAM_IVLEN',                   'size_t'],
+                       ['CIPHER_PARAM_AEAD_TAGLEN',             'size_t'],
+                       ['CIPHER_PARAM_AEAD_TAG',                'octet_string'],
+                       ['CIPHER_PARAM_AEAD_TLS1_AAD_PAD',       'size_t'],
+                      )); -}
 /* End of machine generated */
 
-static const OSSL_PARAM chacha20_poly1305_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_AEAD_TAG, NULL, 0),
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_AEAD_TLS1_AAD_PAD, NULL),
-    OSSL_PARAM_END
-};
 static const OSSL_PARAM *chacha20_poly1305_gettable_ctx_params
     (ossl_unused void *cctx, ossl_unused void *provctx)
 {
     return chacha20_poly1305_known_gettable_ctx_params;
 }
 
-static const OSSL_PARAM chacha20_poly1305_known_settable_ctx_params[] = {
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
-    OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_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_END
-};
+/* Machine generated by util/perl/OpenSSL/paramnames.pm */
+{- produce_param_list('static', 'chacha20_poly1305_known_settable_ctx_params',
+                      'static', 'chacha20_poly1305_set_ctx_params_find_pidx',
+                      (['CIPHER_PARAM_KEYLEN',                  'size_t'],
+                       ['CIPHER_PARAM_IVLEN',                   'size_t'],
+                       ['CIPHER_PARAM_AEAD_TAG',                'octet_string'],
+                       ['CIPHER_PARAM_AEAD_TLS1_AAD',           'octet_string'],
+                       ['CIPHER_PARAM_AEAD_TLS1_IV_FIXED',      'octet_string'],
+                      )); -}
+/* End of machine generated */
+
 static const OSSL_PARAM *chacha20_poly1305_settable_ctx_params(
         ossl_unused void *cctx, ossl_unused void *provctx
     )
@@ -199,16 +196,6 @@ static const OSSL_PARAM *chacha20_poly1305_settable_ctx_params(
     return chacha20_poly1305_known_settable_ctx_params;
 }
 
-/* Machine generated by util/perl/OpenSSL/paramnames.pm */
-static {- produce_decoder('chacha20_poly1305_set_ctx_params_find_pidx',
-                   ('CIPHER_PARAM_KEYLEN',
-                    'CIPHER_PARAM_IVLEN',
-                    'CIPHER_PARAM_AEAD_TAG',
-                    'CIPHER_PARAM_AEAD_TLS1_AAD',
-                    'CIPHER_PARAM_AEAD_TLS1_IV_FIXED',
-                   )); -}
-/* End of machine generated */
-
 static int chacha20_poly1305_set_ctx_params(void *vctx,
                                             const OSSL_PARAM params[])
 {