legacy ciphers: rename files in anticipation of using generated param decoders

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28616)

diff --git a/.gitignore b/.gitignore
index ca897251af8dd4323a9fe082383460cb8cfaad0e..ef4adfb6294f39fc23791450995df50525bdab91 100644 (file)
--- 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 e082484ff56e6de719c6a183d37705fa94c0c60e..4ebf478eac3fb6b5124a8214029c3746f5fb8451 100644 (file)
--- 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 b456ec6f98ffa6bf46d2871017e37257e073c6af..7351766eb3f9dbbc1d9d713ca67d43c924364ca1 100644 (file)
--- 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