chacha20: rename files in anticipation of generated param decoding

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 ef4adfb6294f39fc23791450995df50525bdab91..77518d20479a22d62cffe62d5f1184526a2f6b4d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,7 @@ 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.c
 providers/implementations/ciphers/cipher_chacha20_poly1305.c
 providers/implementations/ciphers/cipher_null.c
 providers/implementations/ciphers/cipher_rc4_hmac_md5.c

diff --git a/build.info b/build.info
index ca53ec0659d9ef8508c4094e89f68570ad96d3ce..13d2a118ccc5af5213b74d24ba9d54feb208825d 100644 (file)
--- a/build.info
+++ b/build.info
@@ -105,6 +105,7 @@ DEPEND[]=include/openssl/asn1.h \
          providers/implementations/ciphers/ciphercommon.c \
          providers/implementations/ciphers/ciphercommon_ccm.c \
          providers/implementations/ciphers/ciphercommon_gcm.c \
+         providers/implementations/ciphers/cipher_chacha20.c \
          providers/implementations/ciphers/cipher_chacha20_poly1305.c \
          providers/implementations/ciphers/cipher_null.c \
          providers/implementations/ciphers/cipher_rc4_hmac_md5.c \
@@ -218,6 +219,7 @@ DEPEND[providers/implementations/asymciphers/rsa_enc.c \
        providers/implementations/ciphers/ciphercommon.c \
        providers/implementations/ciphers/ciphercommon_ccm.c \
        providers/implementations/ciphers/ciphercommon_gcm.c \
+       providers/implementations/ciphers/cipher_chacha20.c \
        providers/implementations/ciphers/cipher_chacha20_poly1305.c \
        providers/implementations/ciphers/cipher_null.c \
        providers/implementations/ciphers/cipher_rc4_hmac_md5.c \
@@ -355,6 +357,8 @@ 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.c]=\
+    providers/implementations/ciphers/cipher_chacha20.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]=\

diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info
index f205885c6543d921d62cb5e7deb3416ce0039bc2..178f07707aa2f7a5d44258d023bd09c3ce259efe 100644 (file)
--- a/providers/implementations/ciphers/build.info
+++ b/providers/implementations/ciphers/build.info
@@ -91,8 +91,8 @@ SOURCE[$COMMON_GOAL]=\
         ciphercommon_ccm.c ciphercommon_ccm_hw.c
 
 INCLUDE[cipher_aes_cbc_hmac_sha.o cipher_aes_cbc_hmac_sha_etm.o \
-        cipher_aes_xts.o ciphercommon.o cipher_chacha20_poly1305.o \
-        cipher_rc4_hmac_md5.o cipher_sm4_xts.o]=.
+        cipher_aes_xts.o ciphercommon.o cipher_chacha20.o \
+        cipher_chacha20_poly1305.o cipher_rc4_hmac_md5.o cipher_sm4_xts.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_chacha20.c b/providers/implementations/ciphers/cipher_chacha20.c.in
similarity index 100%
rename from providers/implementations/ciphers/cipher_chacha20.c
rename to providers/implementations/ciphers/cipher_chacha20.c.in