From: Pauli Date: Wed, 30 Jul 2025 02:12:04 +0000 (+1000) Subject: encode_decode: rename files for generated param parsing X-Git-Tag: openssl-3.6.0-alpha1~137 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33651beaf7c0f22d6b9086a9beadf44ab3dc9457;p=thirdparty%2Fopenssl.git encode_decode: rename files for generated param parsing Reviewed-by: Paul Yang Reviewed-by: Shane Lontis Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/28152) --- diff --git a/.gitignore b/.gitignore index cd0edb3a851..941c1accbd9 100644 --- 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 9f163182d4d..26196bb5fbb 100644 --- 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 a3f0d0897da..c24d24659b8 100644 --- 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 2154d9e3d3d..a5c116a9cf7 100644 --- 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 b4d53f845e6..efe9ad536e9 100644 --- a/providers/implementations/encode_decode/decode_lmsxdr2key.c +++ b/providers/implementations/encode_decode/decode_lmsxdr2key.c @@ -12,7 +12,7 @@ #include #include #include -#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 df327210f11..f1cf46267f6 100644 --- 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 a38c71883dd..b60309d073e 100644 --- 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 ea4585d93c5..57685b2e9f7 100644 --- 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 8cf6d7d41ce..874a705b3ee 100644 --- 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 10b1d10ee17..d082390bea7 100644 --- 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 29e72faa63d..7b69a5fd2a8 100644 --- 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 1f21a512961..4ed07790b21 100644 --- 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 7a564807326..e5fee53584f 100644 --- 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 c4ea2f853cf..38c3e36c0c0 100644 --- a/providers/implementations/encode_decode/endecoder_common.c +++ b/providers/implementations/encode_decode/endecoder_common.c @@ -11,7 +11,7 @@ #include #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 ec9c49a4d43..6ec6dd25cf9 100644 --- a/providers/implementations/encode_decode/ml_common_codecs.c +++ b/providers/implementations/encode_decode/ml_common_codecs.c @@ -11,7 +11,7 @@ #include #include #include -#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 9f94a789d91..d034befcaab 100644 --- a/providers/implementations/encode_decode/ml_dsa_codecs.c +++ b/providers/implementations/encode_decode/ml_dsa_codecs.c @@ -15,7 +15,7 @@ #include #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 fdf6e7bf478..53425aa499c 100644 --- a/providers/implementations/encode_decode/ml_kem_codecs.c +++ b/providers/implementations/encode_decode/ml_kem_codecs.c @@ -14,7 +14,7 @@ #include #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 c0c2e842a24..722434baaee 100644 --- a/providers/implementations/encode_decode/ml_dsa_codecs.h +++ b/providers/implementations/include/prov/ml_dsa_codecs.h @@ -15,7 +15,7 @@ # include # 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 b8a22201ab1..1a48c25ce39 100644 --- a/providers/implementations/encode_decode/ml_kem_codecs.h +++ b/providers/implementations/include/prov/ml_kem_codecs.h @@ -15,7 +15,7 @@ # include # 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,