storemgmt: rename files for generate param decoders

Reviewed-by: Paul Yang <paulyang.inf@gmail.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28147)

diff --git a/.gitignore b/.gitignore
index a9d6b80d47d39ded216e82499592e0593feec2e9..9f128e929a6e8bc2ed23750bee0ce03a3e803861 100644 (file)
--- 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 1890191ff1cf2317a2fc6000b3166053823940f7..58a369049a0dd0c655132302625e376237143f11 100644 (file)
--- 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 ef9f9bb0465069413c3310de7a04a6e82bd68058..11bdb13b072ef8674275d3f9562ba05764a9a751 100644 (file)
--- 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 0d5f875032da306728501535ecf809d0981bdb2c..3194b0d8edfe1880853c72f7c587c19b7898c8e7 100644 (file)
--- 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 fb28b04738d67e41b189116e70eadcdbca43f93e..e94fd93a58a998de763d69a22e9d0045846c9bbc 100644 (file)
--- 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 <windows.h>
 #endif