From: Pauli Date: Thu, 24 Jul 2025 01:14:29 +0000 (+1000) Subject: storemgmt: rename files for generate param decoders X-Git-Tag: openssl-3.6.0-alpha1~156 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2849a80e3313b1f70cb92af7124a730cc5d1a88f;p=thirdparty%2Fopenssl.git storemgmt: rename files for generate param decoders Reviewed-by: Paul Yang Reviewed-by: Shane Lontis Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/28147) --- diff --git a/.gitignore b/.gitignore index a9d6b80d47d..9f128e929a6 100644 --- a/.gitignore +++ b/.gitignore @@ -107,6 +107,9 @@ providers/implementations/keymgmt/mlx_kmgmt.c providers/implementations/signature/eddsa_sig.c providers/implementations/signature/ml_dsa_sig.c providers/implementations/skeymgmt/generic.c +providers/implementations/storemgmt/file_store_any2obj.c +providers/implementations/storemgmt/file_store.c +providers/implementations/storemgmt/winstore_store.c providers/implementations/ciphers/ciphercommon.c providers/implementations/ciphers/ciphercommon_ccm.c providers/implementations/ciphers/ciphercommon_gcm.c diff --git a/build.info b/build.info index 1890191ff1c..58a369049a0 100644 --- a/build.info +++ b/build.info @@ -70,6 +70,9 @@ DEPEND[]=include/openssl/asn1.h \ providers/implementations/signature/eddsa_sig.c \ providers/implementations/signature/ml_dsa_sig.c \ providers/implementations/skeymgmt/generic.c \ + providers/implementations/storemgmt/file_store_any2obj.c \ + providers/implementations/storemgmt/file_store.c \ + providers/implementations/storemgmt/winstore_store.c \ providers/implementations/ciphers/ciphercommon.c \ providers/implementations/ciphers/ciphercommon_ccm.c \ providers/implementations/ciphers/ciphercommon_gcm.c \ @@ -147,6 +150,9 @@ DEPEND[providers/implementations/asymciphers/rsa_enc.c \ providers/implementations/signature/eddsa_sig.c \ providers/implementations/signature/ml_dsa_sig.c \ providers/implementations/skeymgmt/generic.c \ + providers/implementations/storemgmt/file_store_any2obj.c \ + providers/implementations/storemgmt/file_store.c \ + providers/implementations/storemgmt/winstore_store.c \ providers/implementations/ciphers/ciphercommon.c \ providers/implementations/ciphers/ciphercommon_ccm.c \ providers/implementations/ciphers/ciphercommon_gcm.c \ @@ -213,6 +219,12 @@ GENERATE[providers/implementations/signature/ml_dsa_sig.c]=\ providers/implementations/signature/ml_dsa_sig.c.in GENERATE[providers/implementations/skeymgmt/generic.c]=\ providers/implementations/skeymgmt/generic.c.in +GENERATE[providers/implementations/storemgmt/file_store_any2obj.c]=\ + providers/implementations/storemgmt/file_store_any2obj.c.in +GENERATE[providers/implementations/storemgmt/file_store.c]=\ + providers/implementations/storemgmt/file_store.c.in +GENERATE[providers/implementations/storemgmt/winstore_store.c]=\ + providers/implementations/storemgmt/winstore_store.c.in GENERATE[providers/implementations/ciphers/ciphercommon.c]=\ providers/implementations/ciphers/ciphercommon.c.in GENERATE[providers/implementations/ciphers/ciphercommon_ccm.c]=\ diff --git a/providers/implementations/storemgmt/file_store_local.h b/providers/implementations/include/prov/file_store_local.h similarity index 100% rename from providers/implementations/storemgmt/file_store_local.h rename to providers/implementations/include/prov/file_store_local.h diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c.in similarity index 99% rename from providers/implementations/storemgmt/file_store.c rename to providers/implementations/storemgmt/file_store.c.in index ef9f9bb0465..11bdb13b072 100644 --- a/providers/implementations/storemgmt/file_store.c +++ b/providers/implementations/storemgmt/file_store.c.in @@ -30,7 +30,7 @@ #include "prov/implementations.h" #include "prov/bio.h" #include "prov/providercommon.h" -#include "file_store_local.h" +#include "prov/file_store_local.h" DEFINE_STACK_OF(OSSL_STORE_INFO) diff --git a/providers/implementations/storemgmt/file_store_any2obj.c b/providers/implementations/storemgmt/file_store_any2obj.c.in similarity index 99% rename from providers/implementations/storemgmt/file_store_any2obj.c rename to providers/implementations/storemgmt/file_store_any2obj.c.in index 0d5f875032d..3194b0d8edf 100644 --- a/providers/implementations/storemgmt/file_store_any2obj.c +++ b/providers/implementations/storemgmt/file_store_any2obj.c.in @@ -35,7 +35,7 @@ #include "internal/sizes.h" #include "crypto/pem.h" /* For internal PVK and "blob" headers */ #include "prov/bio.h" -#include "file_store_local.h" +#include "prov/file_store_local.h" /* * newctx and freectx are not strictly necessary. However, the method creator, diff --git a/providers/implementations/storemgmt/winstore_store.c b/providers/implementations/storemgmt/winstore_store.c.in similarity index 99% rename from providers/implementations/storemgmt/winstore_store.c rename to providers/implementations/storemgmt/winstore_store.c.in index fb28b04738d..e94fd93a58a 100644 --- a/providers/implementations/storemgmt/winstore_store.c +++ b/providers/implementations/storemgmt/winstore_store.c.in @@ -23,7 +23,7 @@ #include "prov/implementations.h" #include "prov/providercommon.h" #include "prov/bio.h" -#include "file_store_local.h" +#include "prov/file_store_local.h" #ifdef __CYGWIN__ # include #endif