From 9b545c736171ec9a8a46a3e67208d8dc00490e90 Mon Sep 17 00:00:00 2001 From: Pauli Date: Fri, 19 Sep 2025 11:30:29 +1000 Subject: [PATCH] aes: rename files in anticipation of gerenated param decoding Reviewed-by: Shane Lontis Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/28616) --- .gitignore | 4 ++++ build.info | 16 ++++++++++++++++ providers/implementations/ciphers/build.info | 3 ++- ...her_aes_gcm_siv.c => cipher_aes_gcm_siv.c.in} | 0 .../{cipher_aes_ocb.c => cipher_aes_ocb.c.in} | 0 .../{cipher_aes_siv.c => cipher_aes_siv.c.in} | 0 .../{cipher_aes_wrp.c => cipher_aes_wrp.c.in} | 0 7 files changed, 22 insertions(+), 1 deletion(-) rename providers/implementations/ciphers/{cipher_aes_gcm_siv.c => cipher_aes_gcm_siv.c.in} (100%) rename providers/implementations/ciphers/{cipher_aes_ocb.c => cipher_aes_ocb.c.in} (100%) rename providers/implementations/ciphers/{cipher_aes_siv.c => cipher_aes_siv.c.in} (100%) rename providers/implementations/ciphers/{cipher_aes_wrp.c => cipher_aes_wrp.c.in} (100%) diff --git a/.gitignore b/.gitignore index 77518d2047..88cd92f9d0 100644 --- a/.gitignore +++ b/.gitignore @@ -142,6 +142,10 @@ 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_gcm_siv.c +providers/implementations/ciphers/cipher_aes_ocb.c +providers/implementations/ciphers/cipher_aes_siv.c +providers/implementations/ciphers/cipher_aes_wrp.c providers/implementations/ciphers/cipher_aes_xts.c providers/implementations/ciphers/ciphercommon.c providers/implementations/ciphers/ciphercommon_ccm.c diff --git a/build.info b/build.info index 13d2a118cc..d63a1d9e02 100644 --- a/build.info +++ b/build.info @@ -101,6 +101,10 @@ DEPEND[]=include/openssl/asn1.h \ 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_gcm_siv.c \ + providers/implementations/ciphers/cipher_aes_ocb.c \ + providers/implementations/ciphers/cipher_aes_siv.c \ + providers/implementations/ciphers/cipher_aes_wrp.c \ providers/implementations/ciphers/cipher_aes_xts.c \ providers/implementations/ciphers/ciphercommon.c \ providers/implementations/ciphers/ciphercommon_ccm.c \ @@ -215,6 +219,10 @@ DEPEND[providers/implementations/asymciphers/rsa_enc.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_gcm_siv.c \ + providers/implementations/ciphers/cipher_aes_ocb.c \ + providers/implementations/ciphers/cipher_aes_siv.c \ + providers/implementations/ciphers/cipher_aes_wrp.c \ providers/implementations/ciphers/cipher_aes_xts.c \ providers/implementations/ciphers/ciphercommon.c \ providers/implementations/ciphers/ciphercommon_ccm.c \ @@ -349,6 +357,14 @@ GENERATE[providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c]=\ providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c.in GENERATE[providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c]=\ providers/implementations/ciphers/cipher_aes_cbc_hmac_sha_etm.c.in +GENERATE[providers/implementations/ciphers/cipher_aes_gcm_siv.c]=\ + providers/implementations/ciphers/cipher_aes_gcm_siv.c.in +GENERATE[providers/implementations/ciphers/cipher_aes_ocb.c]=\ + providers/implementations/ciphers/cipher_aes_ocb.c.in +GENERATE[providers/implementations/ciphers/cipher_aes_siv.c]=\ + providers/implementations/ciphers/cipher_aes_siv.c.in +GENERATE[providers/implementations/ciphers/cipher_aes_wrp.c]=\ + providers/implementations/ciphers/cipher_aes_wrp.c.in GENERATE[providers/implementations/ciphers/cipher_aes_xts.c]=\ providers/implementations/ciphers/cipher_aes_xts.c.in GENERATE[providers/implementations/ciphers/ciphercommon.c]=\ diff --git a/providers/implementations/ciphers/build.info b/providers/implementations/ciphers/build.info index 178f07707a..dc43b8980c 100644 --- a/providers/implementations/ciphers/build.info +++ b/providers/implementations/ciphers/build.info @@ -91,7 +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.o \ + cipher_aes_gcm_siv.o cipher_aes_ocb.o cipher_aes_siv.o \ + cipher_aes_wrp.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} -}] diff --git a/providers/implementations/ciphers/cipher_aes_gcm_siv.c b/providers/implementations/ciphers/cipher_aes_gcm_siv.c.in similarity index 100% rename from providers/implementations/ciphers/cipher_aes_gcm_siv.c rename to providers/implementations/ciphers/cipher_aes_gcm_siv.c.in diff --git a/providers/implementations/ciphers/cipher_aes_ocb.c b/providers/implementations/ciphers/cipher_aes_ocb.c.in similarity index 100% rename from providers/implementations/ciphers/cipher_aes_ocb.c rename to providers/implementations/ciphers/cipher_aes_ocb.c.in diff --git a/providers/implementations/ciphers/cipher_aes_siv.c b/providers/implementations/ciphers/cipher_aes_siv.c.in similarity index 100% rename from providers/implementations/ciphers/cipher_aes_siv.c rename to providers/implementations/ciphers/cipher_aes_siv.c.in diff --git a/providers/implementations/ciphers/cipher_aes_wrp.c b/providers/implementations/ciphers/cipher_aes_wrp.c.in similarity index 100% rename from providers/implementations/ciphers/cipher_aes_wrp.c rename to providers/implementations/ciphers/cipher_aes_wrp.c.in