From 1ae158da25e57aaf1eb2c48206d5c833f6303b9b Mon Sep 17 00:00:00 2001 From: Pauli Date: Fri, 19 Sep 2025 10:29:16 +1000 Subject: [PATCH] legacy ciphers: rename files in anticipation of using generated param decoders Reviewed-by: Shane Lontis Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/28616) --- .gitignore | 4 ++++ build.info | 8 ++++++++ providers/implementations/ciphers/build.info | 7 +++---- .../ciphers/{cipher_null.c => cipher_null.c.in} | 0 .../{cipher_rc4_hmac_md5.c => cipher_rc4_hmac_md5.c.in} | 0 5 files changed, 15 insertions(+), 4 deletions(-) rename providers/implementations/ciphers/{cipher_null.c => cipher_null.c.in} (100%) rename providers/implementations/ciphers/{cipher_rc4_hmac_md5.c => cipher_rc4_hmac_md5.c.in} (100%) diff --git a/.gitignore b/.gitignore index ca897251af8..ef4adfb6294 100644 --- a/.gitignore +++ b/.gitignore @@ -142,10 +142,14 @@ providers/implementations/storemgmt/file_store.c providers/implementations/storemgmt/winstore_store.c providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c +providers/implementations/ciphers/cipher_aes_xts.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 +providers/implementations/ciphers/cipher_null.c +providers/implementations/ciphers/cipher_rc4_hmac_md5.c +providers/implementations/ciphers/cipher_sm2_xts.c providers/implementations/digests/blake2_prov.c providers/implementations/digests/digestcommon.c providers/implementations/digests/mdc2_prov.c diff --git a/build.info b/build.info index e082484ff56..4ebf478eac3 100644 --- a/build.info +++ b/build.info @@ -105,6 +105,8 @@ DEPEND[]=include/openssl/asn1.h \ providers/implementations/ciphers/ciphercommon_ccm.c \ providers/implementations/ciphers/ciphercommon_gcm.c \ providers/implementations/ciphers/cipher_chacha20_poly1305.c \ + providers/implementations/ciphers/cipher_null.c \ + providers/implementations/ciphers/cipher_rc4_hmac_md5.c \ providers/implementations/digests/blake2_prov.c \ providers/implementations/digests/digestcommon.c \ providers/implementations/digests/mdc2_prov.c \ @@ -214,6 +216,8 @@ DEPEND[providers/implementations/asymciphers/rsa_enc.c \ providers/implementations/ciphers/ciphercommon_ccm.c \ providers/implementations/ciphers/ciphercommon_gcm.c \ providers/implementations/ciphers/cipher_chacha20_poly1305.c \ + providers/implementations/ciphers/cipher_null.c \ + providers/implementations/ciphers/cipher_rc4_hmac_md5.c \ providers/implementations/digests/blake2_prov.c \ providers/implementations/digests/digestcommon.c \ providers/implementations/digests/mdc2_prov.c \ @@ -347,6 +351,10 @@ 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[providers/implementations/ciphers/cipher_null.c]=\ + providers/implementations/ciphers/cipher_null.c.in +GENERATE[providers/implementations/ciphers/cipher_rc4_hmac_md5.c]=\ + providers/implementations/ciphers/cipher_rc4_hmac_md5.c.in GENERATE[providers/implementations/digests/blake2_prov.c]=\ providers/implementations/digests/blake2_prov.c.in GENERATE[providers/implementations/digests/digestcommon.c]=\ diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info index b456ec6f98f..7351766eb3f 100644 --- a/providers/implementations/ciphers/build.info +++ b/providers/implementations/ciphers/build.info @@ -90,10 +90,9 @@ SOURCE[$COMMON_GOAL]=\ ciphercommon_gcm.c ciphercommon_gcm_hw.c \ ciphercommon_ccm.c ciphercommon_ccm_hw.c -INCLUDE[cipher_aes_cbc_hmac_sha.o]=. -INCLUDE[cipher_aes_cbc_hmac_sha_etm.o]=. -INCLUDE[ciphercommon.o]=. -INCLUDE[cipher_chacha20_poly1305.o]=. +INCLUDE[cipher_aes_cbc_hmac_sha.o cipher_aes_cbc_hmac_sha_etm.o \ + ciphercommon.o cipher_chacha20_poly1305.o \ + cipher_des.o cipher_rc2.o cipher_rc4_hmac_md5.o cipher_rc5.o]=. IF[{- !$disabled{des} -}] SOURCE[$TDES_1_GOAL]=cipher_tdes.c cipher_tdes_common.c cipher_tdes_hw.c diff --git a/providers/implementations/ciphers/cipher_null.c b/providers/implementations/ciphers/cipher_null.c.in similarity index 100% rename from providers/implementations/ciphers/cipher_null.c rename to providers/implementations/ciphers/cipher_null.c.in diff --git a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c.in similarity index 100% rename from providers/implementations/ciphers/cipher_rc4_hmac_md5.c rename to providers/implementations/ciphers/cipher_rc4_hmac_md5.c.in -- 2.47.3