change _ettable to _list

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27847)

diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305.c.in b/providers/implementations/ciphers/cipher_chacha20_poly1305.c.in
index 890f9ad75af8b81dd6a340940200d8526c4caf48..da4956aba1b09b0142f6d35adec99e882b8e18bf 100644 (file)
--- a/providers/implementations/ciphers/cipher_chacha20_poly1305.c.in
+++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.c.in
@@ -160,7 +160,7 @@ static int chacha20_poly1305_get_ctx_params(void *vctx, OSSL_PARAM params[])
 static const OSSL_PARAM *chacha20_poly1305_gettable_ctx_params
     (ossl_unused void *cctx, ossl_unused void *provctx)
 {
-    return chacha20_poly1305_get_ctx_params_ettable;
+    return chacha20_poly1305_get_ctx_params_list;
 }
 
 {- produce_param_decoder('chacha20_poly1305_set_ctx_params',
@@ -175,7 +175,7 @@ static const OSSL_PARAM *chacha20_poly1305_settable_ctx_params(
         ossl_unused void *cctx, ossl_unused void *provctx
     )
 {
-    return chacha20_poly1305_set_ctx_params_ettable;
+    return chacha20_poly1305_set_ctx_params_list;
 }
 
 static int chacha20_poly1305_set_ctx_params(void *vctx,

diff --git a/providers/implementations/ciphers/ciphercommon.c.in b/providers/implementations/ciphers/ciphercommon.c.in
index 8014134de87696b0d5dd0f8903fb290acdfda576..639d4d1e7c4879e2b3c6d6b233b15993836c26b1 100644 (file)
--- a/providers/implementations/ciphers/ciphercommon.c.in
+++ b/providers/implementations/ciphers/ciphercommon.c.in
@@ -43,7 +43,7 @@ use OpenSSL::paramnames qw(produce_param_decoder);
 
 const OSSL_PARAM *ossl_cipher_generic_gettable_params(ossl_unused void *provctx)
 {
-    return ossl_cipher_generic_get_ctx_params_ettable;
+    return ossl_cipher_generic_get_ctx_params_list;
 }
 
 int ossl_cipher_generic_get_params(OSSL_PARAM params[], unsigned int md,

diff --git a/providers/implementations/ciphers/ciphercommon_ccm.c.in b/providers/implementations/ciphers/ciphercommon_ccm.c.in
index a6d71bd2b086e359705670eb2ea4b2301728f777..2303ae949c7e6c5553a4c21b6c5fa98752a28380 100644 (file)
--- a/providers/implementations/ciphers/ciphercommon_ccm.c.in
+++ b/providers/implementations/ciphers/ciphercommon_ccm.c.in
@@ -80,7 +80,7 @@ const OSSL_PARAM *ossl_ccm_settable_ctx_params(
         ossl_unused void *cctx, ossl_unused void *provctx
     )
 {
-    return ossl_cipher_ccm_set_ctx_params_ettable;
+    return ossl_cipher_ccm_set_ctx_params_list;
 }
 
 int ossl_ccm_set_ctx_params(void *vctx, const OSSL_PARAM params[])
@@ -171,7 +171,7 @@ const OSSL_PARAM *ossl_ccm_gettable_ctx_params(
         ossl_unused void *cctx, ossl_unused void *provctx
     )
 {
-    return ossl_cipher_ccm_get_ctx_params_ettable;
+    return ossl_cipher_ccm_get_ctx_params_list;
 }
 
 int ossl_ccm_get_ctx_params(void *vctx, OSSL_PARAM params[])

diff --git a/providers/implementations/ciphers/ciphercommon_gcm.c.in b/providers/implementations/ciphers/ciphercommon_gcm.c.in
index afa3ac7237855b492261951bbf1d28328adb1cd9..43490719561baccf8d9d06b311b0a08a4c177120 100644 (file)
--- a/providers/implementations/ciphers/ciphercommon_gcm.c.in
+++ b/providers/implementations/ciphers/ciphercommon_gcm.c.in
@@ -159,7 +159,7 @@ const OSSL_PARAM *ossl_gcm_gettable_ctx_params(
         ossl_unused void *cctx, ossl_unused void *provctx
     )
 {
-    return ossl_cipher_gcm_get_ctx_params_ettable;
+    return ossl_cipher_gcm_get_ctx_params_list;
 }
 
 int ossl_gcm_get_ctx_params(void *vctx, OSSL_PARAM params[])
@@ -261,7 +261,7 @@ const OSSL_PARAM *ossl_gcm_settable_ctx_params(
         ossl_unused void *cctx, ossl_unused void *provctx
     )
 {
-    return ossl_cipher_gcm_set_ctx_params_ettable;
+    return ossl_cipher_gcm_set_ctx_params_list;
 }
 
 int ossl_gcm_set_ctx_params(void *vctx, const OSSL_PARAM params[])

diff --git a/providers/implementations/keymgmt/ml_dsa_kmgmt.c.in b/providers/implementations/keymgmt/ml_dsa_kmgmt.c.in
index 962e3c2f61695b496402726a1d948a324b901bf2..841def9c49c9b7b7011cf20c97d1f563424ff04d 100644 (file)
--- a/providers/implementations/keymgmt/ml_dsa_kmgmt.c.in
+++ b/providers/implementations/keymgmt/ml_dsa_kmgmt.c.in
@@ -293,7 +293,7 @@ static const OSSL_PARAM *ml_dsa_imexport_types(int selection)
 {
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) == 0)
         return NULL;
-    return ml_dsa_key_type_params_ettable;
+    return ml_dsa_key_type_params_list;
 }
 
 {- produce_param_decoder('ml_dsa_get_params',
@@ -309,7 +309,7 @@ static const OSSL_PARAM *ml_dsa_imexport_types(int selection)
 
 static const OSSL_PARAM *ml_dsa_gettable_params(void *provctx)
 {
-    return ml_dsa_get_params_ettable;
+    return ml_dsa_get_params_list;
 }
 
 static int ml_dsa_get_params(void *keydata, OSSL_PARAM params[])
@@ -541,7 +541,7 @@ static int ml_dsa_gen_set_params(void *genctx, const OSSL_PARAM params[])
 static const OSSL_PARAM *ml_dsa_gen_settable_params(ossl_unused void *genctx,
                                                     ossl_unused void *provctx)
 {
-    return ml_dsa_gen_set_params_ettable;
+    return ml_dsa_gen_set_params_list;
 }
 
 static void ml_dsa_gen_cleanup(void *genctx)

diff --git a/providers/implementations/keymgmt/ml_kem_kmgmt.c.in b/providers/implementations/keymgmt/ml_kem_kmgmt.c.in
index 19cd4639e92ad01515fefdce52e89f3412482086..775a66c364784f65d8c0e94f76eb8c0be764e3f4 100644 (file)
--- a/providers/implementations/keymgmt/ml_kem_kmgmt.c.in
+++ b/providers/implementations/keymgmt/ml_kem_kmgmt.c.in
@@ -337,7 +337,7 @@ err:
 static const OSSL_PARAM *ml_kem_imexport_types(int selection)
 {
     if ((selection & OSSL_KEYMGMT_SELECT_KEYPAIR) != 0)
-        return ml_kem_key_type_params_ettable;
+        return ml_kem_key_type_params_list;
     return NULL;
 }
 
@@ -498,7 +498,7 @@ static int ml_kem_import(void *vkey, int selection, const OSSL_PARAM params[])
 
 static const OSSL_PARAM *ml_kem_gettable_params(void *provctx)
 {
-    return ml_kem_get_params_ettable;
+    return ml_kem_get_params_list;
 }
 
 #ifndef FIPS_MODULE
@@ -620,7 +620,7 @@ static int ml_kem_get_params(void *vkey, OSSL_PARAM params[])
 
 static const OSSL_PARAM *ml_kem_settable_params(void *provctx)
 {
-    return ml_kem_set_params_ettable;
+    return ml_kem_set_params_list;
 }
 
 static int ml_kem_set_params(void *vkey, const OSSL_PARAM params[])
@@ -726,7 +726,7 @@ static void *ml_kem_gen_init(void *provctx, int selection,
 static const OSSL_PARAM *ml_kem_gen_settable_params(ossl_unused void *vgctx,
                                                     ossl_unused void *provctx)
 {
-    return ml_kem_gen_set_params_ettable;
+    return ml_kem_gen_set_params_list;
 }
 
 static void *ml_kem_gen(void *vgctx, OSSL_CALLBACK *osslcb, void *cbarg)

diff --git a/util/perl/OpenSSL/paramnames.pm b/util/perl/OpenSSL/paramnames.pm
index a2b44cd7e46f1dd0e8ab9c18128b4ba5c7d9e7f7..e411329b4f13c81df277b37cac72e0c29067a3c7 100644 (file)
--- a/util/perl/OpenSSL/paramnames.pm
+++ b/util/perl/OpenSSL/paramnames.pm
@@ -763,8 +763,8 @@ sub output_param_decoder {
 
     print "/* Machine generated by util/perl/OpenSSL/paramnames.pm */\n";
     # Output ettable param array
-    printf "#ifndef %s_ettable\n", $decoder_name_base;
-    printf "static const OSSL_PARAM %s_ettable[] = {\n", $decoder_name_base;
+    printf "#ifndef %s_list\n", $decoder_name_base;
+    printf "static const OSSL_PARAM %s_list[] = {\n", $decoder_name_base;
     for (my $i = 0; $i <= $#params; $i++) {
         my $pname = $params[$i][0];
         my $pident = $params[$i][1];