From: Pauli <ppzgs1@gmail.com>
Date: Tue, 17 Jun 2025 04:27:30 +0000 (+1000)
Subject: build: build struct based param files
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85cfd18d1c96be8311bd07c99b2f873035ca928d;p=thirdparty%2Fopenssl.git

build: build struct based param files

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/.gitignore b/.gitignore
index ad2a4117200..1233c5d2fed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,7 +58,6 @@
 /include/openssl/x509_acert.h
 /include/openssl/x509_vfy.h
 /include/openssl/core_names.h
-/include/internal/param_names.h
 
 # Auto generated parameter name files
 /crypto/params_idx.c
@@ -88,6 +87,8 @@ providers/common/include/prov/der_ml_dsa.h
 providers/implementations/keymgmt/ml_dsa_kmgmt.c
 providers/implementations/keymgmt/ml_kem_kmgmt.c
 providers/implementations/ciphers/ciphercommon.c
+providers/implementations/ciphers/ciphercommon_ccm.c
+providers/implementations/ciphers/ciphercommon_gcm.c
 providers/implementations/ciphers/cipher_chacha20_poly1305.c
 
 # error code files
diff --git a/build.info b/build.info
index 0d6674ed61d..1cbf4bef8ec 100644
--- a/build.info
+++ b/build.info
@@ -48,10 +48,11 @@ DEPEND[]=include/openssl/asn1.h \
          include/openssl/x509_acert.h \
          include/openssl/x509_vfy.h \
          include/crypto/bn_conf.h include/crypto/dso_conf.h \
-         include/internal/param_names.h \
          providers/implementations/keymgmt/ml_dsa_kmgmt.c \
          providers/implementations/keymgmt/ml_kem_kmgmt.c \
          providers/implementations/ciphers/ciphercommon.c \
+         providers/implementations/ciphers/ciphercommon_ccm.c \
+         providers/implementations/ciphers/ciphercommon_gcm.c \
          providers/implementations/ciphers/cipher_chacha20_poly1305.c
 
 GENERATE[include/openssl/asn1.h]=include/openssl/asn1.h.in
@@ -87,19 +88,23 @@ GENERATE[include/openssl/x509_vfy.h]=include/openssl/x509_vfy.h.in
 GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in
 GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in
 
-DEPEND[include/internal/param_names.h \
-       providers/implementations/keymgmt/ml_dsa_kmgmt.c \
+DEPEND[providers/implementations/keymgmt/ml_dsa_kmgmt.c \
        providers/implementations/keymgmt/ml_kem_kmgmt.c \
        providers/implementations/ciphers/ciphercommon.c \
+       providers/implementations/ciphers/ciphercommon_ccm.c \
+       providers/implementations/ciphers/ciphercommon_gcm.c \
        providers/implementations/ciphers/cipher_chacha20_poly1305.c \
        include/openssl/core_names.h]=util/perl|OpenSSL/paramnames.pm
-GENERATE[include/internal/param_names.h]=include/internal/param_names.h.in
 GENERATE[providers/implementations/keymgmt/ml_dsa_kmgmt.c]=\
     providers/implementations/keymgmt/ml_dsa_kmgmt.c.in
 GENERATE[providers/implementations/keymgmt/ml_kem_kmgmt.c]=\
     providers/implementations/keymgmt/ml_kem_kmgmt.c.in
 GENERATE[providers/implementations/ciphers/ciphercommon.c]=\
     providers/implementations/ciphers/ciphercommon.c.in
+GENERATE[providers/implementations/ciphers/ciphercommon_ccm.c]=\
+    providers/implementations/ciphers/ciphercommon_ccm.c.in
+GENERATE[providers/implementations/ciphers/ciphercommon_gcm.c]=\
+    providers/implementations/ciphers/ciphercommon_gcm.c.in
 GENERATE[providers/implementations/ciphers/cipher_chacha20_poly1305.c]=\
     providers/implementations/ciphers/cipher_chacha20_poly1305.c.in
 GENERATE[include/openssl/core_names.h]=include/openssl/core_names.h.in