encode_decode: rename files for generated param parsing

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/28152)

diff --git a/.gitignore b/.gitignore
index cd0edb3a851f810c45ca984bca6f3985f7c0f62d..941c1accbd92efe79b8e785a3853b1c7d313f758 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -91,6 +91,13 @@ providers/implementations/asymciphers/sm2_enc.c
 providers/implementations/exchange/dh_exch.c
 providers/implementations/exchange/ecdh_exch.c
 providers/implementations/exchange/ecx_exch.c
+providers/implementations/encode_decode/decode_der2key.c
+providers/implementations/encode_decode/decode_epki2pki.c
+providers/implementations/encode_decode/decode_pem2der.c
+providers/implementations/encode_decode/decode_pvk2key.c
+providers/implementations/encode_decode/decode_spki2typespki.c
+providers/implementations/encode_decode/encode_key2any.c
+providers/implementations/encode_decode/encode_key2ms.c
 providers/implementations/kdfs/argon2.c
 providers/implementations/kdfs/hkdf.c
 providers/implementations/kdfs/hmacdrbg_kdf.c

diff --git a/build.info b/build.info
index 9f163182d4d61be613bf913e108121424c230e16..26196bb5fbb15909f767c044d0a23beb68b68cf2 100644 (file)
--- a/build.info
+++ b/build.info
@@ -53,6 +53,13 @@ DEPEND[]=include/openssl/asn1.h \
          providers/implementations/exchange/dh_exch.c \
          providers/implementations/exchange/ecdh_exch.c \
          providers/implementations/exchange/ecx_exch.c \
+         providers/implementations/encode_decode/decode_der2key.c \
+         providers/implementations/encode_decode/decode_epki2pki.c \
+         providers/implementations/encode_decode/decode_pem2der.c \
+         providers/implementations/encode_decode/decode_pvk2key.c \
+         providers/implementations/encode_decode/decode_spki2typespki.c \
+         providers/implementations/encode_decode/encode_key2any.c \
+         providers/implementations/encode_decode/encode_key2ms.c \
          providers/implementations/kdfs/argon2.c \
          providers/implementations/kdfs/hkdf.c \
          providers/implementations/kdfs/hmacdrbg_kdf.c \
@@ -145,6 +152,13 @@ DEPEND[providers/implementations/asymciphers/rsa_enc.c \
        providers/implementations/exchange/dh_exch.c \
        providers/implementations/exchange/ecdh_exch.c \
        providers/implementations/exchange/ecx_exch.c \
+       providers/implementations/encode_decode/decode_der2key.c \
+       providers/implementations/encode_decode/decode_epki2pki.c \
+       providers/implementations/encode_decode/decode_pem2der.c \
+       providers/implementations/encode_decode/decode_pvk2key.c \
+       providers/implementations/encode_decode/decode_spki2typespki.c \
+       providers/implementations/encode_decode/encode_key2any.c \
+       providers/implementations/encode_decode/encode_key2ms.c \
        providers/implementations/kdfs/argon2.c \
        providers/implementations/kdfs/hkdf.c \
        providers/implementations/kdfs/hmacdrbg_kdf.c \
@@ -209,6 +223,20 @@ GENERATE[providers/implementations/exchange/ecdh_exch.c]=\
     providers/implementations/exchange/ecdh_exch.c.in
 GENERATE[providers/implementations/exchange/ecx_exch.c]=\
     providers/implementations/exchange/ecx_exch.c.in
+GENERATE[providers/implementations/encode_decode/decode_der2key.c]=\
+    providers/implementations/encode_decode/decode_der2key.c.in
+GENERATE[providers/implementations/encode_decode/decode_epki2pki.c]=\
+    providers/implementations/encode_decode/decode_epki2pki.c.in
+GENERATE[providers/implementations/encode_decode/decode_pem2der.c]=\
+    providers/implementations/encode_decode/decode_pem2der.c.in
+GENERATE[providers/implementations/encode_decode/decode_pvk2key.c]=\
+    providers/implementations/encode_decode/decode_pvk2key.c.in
+GENERATE[providers/implementations/encode_decode/decode_spki2typespki.c]=\
+    providers/implementations/encode_decode/decode_spki2typespki.c.in
+GENERATE[providers/implementations/encode_decode/encode_key2any.c]=\
+    providers/implementations/encode_decode/encode_key2any.c.in
+GENERATE[providers/implementations/encode_decode/encode_key2ms.c]=\
+    providers/implementations/encode_decode/encode_key2ms.c.in
 GENERATE[providers/implementations/kdfs/argon2.c]=\
     providers/implementations/kdfs/argon2.c.in
 GENERATE[providers/implementations/kdfs/hkdf.c]=\

diff --git a/providers/implementations/encode_decode/decode_der2key.c b/providers/implementations/encode_decode/decode_der2key.c.in
similarity index 99%
rename from providers/implementations/encode_decode/decode_der2key.c
rename to providers/implementations/encode_decode/decode_der2key.c.in
index a3f0d0897dae5787988ba6d7e9dc692ff56ff801..c24d24659b89f51cadfb47072073e15eb2b35b22 100644 (file)
--- a/providers/implementations/encode_decode/decode_der2key.c
+++ b/providers/implementations/encode_decode/decode_der2key.c.in
@@ -40,7 +40,7 @@
 #include "openssl/obj_mac.h"
 #include "prov/bio.h"
 #include "prov/implementations.h"
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 #include "internal/nelem.h"
 #include "ml_dsa_codecs.h"
 #include "ml_kem_codecs.h"

diff --git a/providers/implementations/encode_decode/decode_epki2pki.c b/providers/implementations/encode_decode/decode_epki2pki.c.in
similarity index 99%
rename from providers/implementations/encode_decode/decode_epki2pki.c
rename to providers/implementations/encode_decode/decode_epki2pki.c.in
index 2154d9e3d3da18b11f65ae9bda383ee91f357ae4..a5c116a9cf79daabbcf06bf5dc6f4b071c8f01dc 100644 (file)
--- a/providers/implementations/encode_decode/decode_epki2pki.c
+++ b/providers/implementations/encode_decode/decode_epki2pki.c.in
@@ -22,7 +22,7 @@
 #include "prov/bio.h"
 #include "prov/decoders.h"
 #include "prov/implementations.h"
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 
 static OSSL_FUNC_decoder_newctx_fn epki2pki_newctx;
 static OSSL_FUNC_decoder_freectx_fn epki2pki_freectx;

diff --git a/providers/implementations/encode_decode/decode_lmsxdr2key.c b/providers/implementations/encode_decode/decode_lmsxdr2key.c
index b4d53f845e623150bb2763d2a290ad9635257437..efe9ad536e96d7911ab41b36ea3ca39a96eb942e 100644 (file)
--- a/providers/implementations/encode_decode/decode_lmsxdr2key.c
+++ b/providers/implementations/encode_decode/decode_lmsxdr2key.c
@@ -12,7 +12,7 @@
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/params.h>
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 #include "crypto/lms.h"
 #include "prov/bio.h"
 #include "prov/implementations.h"

diff --git a/providers/implementations/encode_decode/decode_msblob2key.c b/providers/implementations/encode_decode/decode_msblob2key.c
index df327210f1140e36adaf2d49acf332c6f5c5370a..f1cf46267f6b2d022331963470da4cf869b4b5b5 100644 (file)
--- a/providers/implementations/encode_decode/decode_msblob2key.c
+++ b/providers/implementations/encode_decode/decode_msblob2key.c
@@ -28,7 +28,7 @@
 #include "crypto/rsa.h"
 #include "prov/bio.h"
 #include "prov/implementations.h"
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 
 struct msblob2key_ctx_st;            /* Forward declaration */
 typedef void *b2i_of_void_fn(const unsigned char **in, unsigned int bitlen,

diff --git a/providers/implementations/encode_decode/decode_pem2der.c b/providers/implementations/encode_decode/decode_pem2der.c.in
similarity index 99%
rename from providers/implementations/encode_decode/decode_pem2der.c
rename to providers/implementations/encode_decode/decode_pem2der.c.in
index a38c71883dd14c967c9d3adbcda011e211570c4a..b60309d073e1b06c5485c644acca054c1922f6af 100644 (file)
--- a/providers/implementations/encode_decode/decode_pem2der.c
+++ b/providers/implementations/encode_decode/decode_pem2der.c.in
@@ -28,7 +28,7 @@
 #include "prov/bio.h"
 #include "prov/decoders.h"
 #include "prov/implementations.h"
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 
 static int read_pem(PROV_CTX *provctx, OSSL_CORE_BIO *cin,
                     char **pem_name, char **pem_header,

diff --git a/providers/implementations/encode_decode/decode_pvk2key.c b/providers/implementations/encode_decode/decode_pvk2key.c.in
similarity index 99%
rename from providers/implementations/encode_decode/decode_pvk2key.c
rename to providers/implementations/encode_decode/decode_pvk2key.c.in
index ea4585d93c5c77c47ba94716040bfe589a59f838..57685b2e9f7fad915747e7fbda4f17023c05eb9c 100644 (file)
--- a/providers/implementations/encode_decode/decode_pvk2key.c
+++ b/providers/implementations/encode_decode/decode_pvk2key.c.in
@@ -29,7 +29,7 @@
 #include "crypto/rsa.h"
 #include "prov/bio.h"
 #include "prov/implementations.h"
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 
 struct pvk2key_ctx_st;            /* Forward declaration */
 typedef int check_key_fn(void *, struct pvk2key_ctx_st *ctx);

diff --git a/providers/implementations/encode_decode/decode_spki2typespki.c b/providers/implementations/encode_decode/decode_spki2typespki.c.in
similarity index 99%
rename from providers/implementations/encode_decode/decode_spki2typespki.c
rename to providers/implementations/encode_decode/decode_spki2typespki.c.in
index 8cf6d7d41ce3eba3aed3c19711c7b13b17a4460b..874a705b3ee15ab0dc31c7120b1263eeda33ff08 100644 (file)
--- a/providers/implementations/encode_decode/decode_spki2typespki.c
+++ b/providers/implementations/encode_decode/decode_spki2typespki.c.in
@@ -19,7 +19,7 @@
 #include "prov/bio.h"
 #include "prov/decoders.h"
 #include "prov/implementations.h"
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 
 static OSSL_FUNC_decoder_newctx_fn spki2typespki_newctx;
 static OSSL_FUNC_decoder_freectx_fn spki2typespki_freectx;

diff --git a/providers/implementations/encode_decode/encode_key2any.c b/providers/implementations/encode_decode/encode_key2any.c.in
similarity index 99%
rename from providers/implementations/encode_decode/encode_key2any.c
rename to providers/implementations/encode_decode/encode_key2any.c.in
index 10b1d10ee172acc023bf81e62401e1dfe9edd1b5..d082390bea7849f5e75ea6aef3321c5bb9cd62c2 100644 (file)
--- a/providers/implementations/encode_decode/encode_key2any.c
+++ b/providers/implementations/encode_decode/encode_key2any.c.in
@@ -38,7 +38,7 @@
 #include "prov/bio.h"
 #include "prov/provider_ctx.h"
 #include "prov/der_rsa.h"
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 #include "ml_dsa_codecs.h"
 #include "ml_kem_codecs.h"
 

diff --git a/providers/implementations/encode_decode/encode_key2blob.c b/providers/implementations/encode_decode/encode_key2blob.c
index 29e72faa63defc61efd1286c684ea301243af5a5..7b69a5fd2a8df49e5164a3350951c78d3ec67d20 100644 (file)
--- a/providers/implementations/encode_decode/encode_key2blob.c
+++ b/providers/implementations/encode_decode/encode_key2blob.c
@@ -24,7 +24,7 @@
 #include "prov/implementations.h"
 #include "prov/bio.h"
 #include "prov/provider_ctx.h"
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 
 static int write_blob(void *provctx, OSSL_CORE_BIO *cout,
                       void *data, int len)

diff --git a/providers/implementations/encode_decode/encode_key2ms.c b/providers/implementations/encode_decode/encode_key2ms.c.in
similarity index 99%
rename from providers/implementations/encode_decode/encode_key2ms.c
rename to providers/implementations/encode_decode/encode_key2ms.c.in
index 1f21a5129615aa166accda204420d303aacdc6d5..4ed07790b21f8c99c1519cb4f6a021e9d6dfb8f2 100644 (file)
--- a/providers/implementations/encode_decode/encode_key2ms.c
+++ b/providers/implementations/encode_decode/encode_key2ms.c.in
@@ -25,7 +25,7 @@
 #include "prov/implementations.h"
 #include "prov/bio.h"
 #include "prov/provider_ctx.h"
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 
 struct key2ms_ctx_st {
     PROV_CTX *provctx;

diff --git a/providers/implementations/encode_decode/encode_key2text.c b/providers/implementations/encode_decode/encode_key2text.c
index 7a564807326f0516660cacd7cc10c311732f407d..e5fee53584f689c8aae50d17e4dcd6ed577dff6b 100644 (file)
--- a/providers/implementations/encode_decode/encode_key2text.c
+++ b/providers/implementations/encode_decode/encode_key2text.c
@@ -30,9 +30,9 @@
 #include "prov/bio.h"
 #include "prov/implementations.h"
 #include "internal/encoder.h"
-#include "endecoder_local.h"
-#include "ml_dsa_codecs.h"
-#include "ml_kem_codecs.h"
+#include "prov/endecoder_local.h"
+#include "prov/ml_dsa_codecs.h"
+#include "prov/ml_kem_codecs.h"
 
 DEFINE_SPECIAL_STACK_OF_CONST(BIGNUM_const, BIGNUM)
 

diff --git a/providers/implementations/encode_decode/endecoder_common.c b/providers/implementations/encode_decode/endecoder_common.c
index c4ea2f853cfc05b94e6f513de80c2be4434e3de1..38c3e36c0c0fb0b9023a94ff1fa4a2169aeae33b 100644 (file)
--- a/providers/implementations/encode_decode/endecoder_common.c
+++ b/providers/implementations/encode_decode/endecoder_common.c
@@ -11,7 +11,7 @@
 #include <openssl/buffer.h>
 #include "internal/asn1.h"
 #include "prov/bio.h"
-#include "endecoder_local.h"
+#include "prov/endecoder_local.h"
 
 OSSL_FUNC_keymgmt_new_fn *
 ossl_prov_get_keymgmt_new(const OSSL_DISPATCH *fns)

diff --git a/providers/implementations/encode_decode/ml_common_codecs.c b/providers/implementations/encode_decode/ml_common_codecs.c
index ec9c49a4d439a4fdd65276372e068e38d409bc8e..6ec6dd25cf93d45ef6f076cf8f0004203329fdca 100644 (file)
--- a/providers/implementations/encode_decode/ml_common_codecs.c
+++ b/providers/implementations/encode_decode/ml_common_codecs.c
@@ -11,7 +11,7 @@
 #include <openssl/crypto.h>
 #include <openssl/err.h>
 #include <openssl/proverr.h>
-#include "ml_common_codecs.h"
+#include "prov/ml_common_codecs.h"
 
 static int pref_cmp(const void *va, const void *vb)
 {

diff --git a/providers/implementations/encode_decode/ml_dsa_codecs.c b/providers/implementations/encode_decode/ml_dsa_codecs.c
index 9f94a789d91cb91c90ac8772e1d8e3260273618d..d034befcaab2fd8a9f2ce41a2dc0263a5ca27ea4 100644 (file)
--- a/providers/implementations/encode_decode/ml_dsa_codecs.c
+++ b/providers/implementations/encode_decode/ml_dsa_codecs.c
@@ -15,7 +15,7 @@
 #include <openssl/core_names.h>
 #include "internal/encoder.h"
 #include "prov/ml_dsa.h"
-#include "ml_dsa_codecs.h"
+#include "prov/ml_dsa_codecs.h"
 
 /*-
  * Tables describing supported ASN.1 input/output formats.

diff --git a/providers/implementations/encode_decode/ml_kem_codecs.c b/providers/implementations/encode_decode/ml_kem_codecs.c
index fdf6e7bf478b8a7d1977781d393449dc28f3fa40..53425aa499c6e4050ed14839c9bf1d14ef7a47f1 100644 (file)
--- a/providers/implementations/encode_decode/ml_kem_codecs.c
+++ b/providers/implementations/encode_decode/ml_kem_codecs.c
@@ -14,7 +14,7 @@
 #include <openssl/core_names.h>
 #include "internal/encoder.h"
 #include "prov/ml_kem.h"
-#include "ml_kem_codecs.h"
+#include "prov/ml_kem_codecs.h"
 
 /* Tables describing supported ASN.1 input/output formats. */
 

diff --git a/providers/implementations/encode_decode/endecoder_local.h b/providers/implementations/include/prov/endecoder_local.h
similarity index 100%
rename from providers/implementations/encode_decode/endecoder_local.h
rename to providers/implementations/include/prov/endecoder_local.h

diff --git a/providers/implementations/encode_decode/ml_common_codecs.h b/providers/implementations/include/prov/ml_common_codecs.h
similarity index 100%
rename from providers/implementations/encode_decode/ml_common_codecs.h
rename to providers/implementations/include/prov/ml_common_codecs.h

diff --git a/providers/implementations/encode_decode/ml_dsa_codecs.h b/providers/implementations/include/prov/ml_dsa_codecs.h
similarity index 97%
rename from providers/implementations/encode_decode/ml_dsa_codecs.h
rename to providers/implementations/include/prov/ml_dsa_codecs.h
index c0c2e842a24210e5dbc9511ff6eaddc5c34be743..722434baaeeda354a0bc8fe64360ecd897b99690 100644 (file)
--- a/providers/implementations/encode_decode/ml_dsa_codecs.h
+++ b/providers/implementations/include/prov/ml_dsa_codecs.h
@@ -15,7 +15,7 @@
 #  include <openssl/e_os2.h>
 #  include "crypto/ml_dsa.h"
 #  include "prov/provider_ctx.h"
-#  include "ml_common_codecs.h"
+#  include "prov/ml_common_codecs.h"
 
 __owur
 ML_DSA_KEY *ossl_ml_dsa_d2i_PUBKEY(const uint8_t *pubenc, int publen,

diff --git a/providers/implementations/encode_decode/ml_kem_codecs.h b/providers/implementations/include/prov/ml_kem_codecs.h
similarity index 97%
rename from providers/implementations/encode_decode/ml_kem_codecs.h
rename to providers/implementations/include/prov/ml_kem_codecs.h
index b8a22201ab1712d7860739c6ea18b7c05b06b468..1a48c25ce39f10b9ada38d8570b76b1ce7b16b19 100644 (file)
--- a/providers/implementations/encode_decode/ml_kem_codecs.h
+++ b/providers/implementations/include/prov/ml_kem_codecs.h
@@ -15,7 +15,7 @@
 #  include <openssl/e_os2.h>
 #  include "crypto/ml_kem.h"
 #  include "prov/provider_ctx.h"
-#  include "ml_common_codecs.h"
+#  include "prov/ml_common_codecs.h"
 
 __owur
 ML_KEM_KEY *ossl_ml_kem_d2i_PUBKEY(const uint8_t *pubenc, int publen,