From: Norbert Pocs Date: Thu, 20 Nov 2025 15:11:27 +0000 (+0100) Subject: Providers: Remove OSSL_ALG_PARAM_ENGINE X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=694a10e80858040877d2bf2eb51469f8d0a683ce;p=thirdparty%2Fopenssl.git Providers: Remove OSSL_ALG_PARAM_ENGINE Resolves: https://github.com/openssl/project/issues/1427 Signed-off-by: Norbert Pocs Reviewed-by: Paul Yang Reviewed-by: Eugene Syromiatnikov Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/29183) --- diff --git a/providers/implementations/asymciphers/sm2_enc.inc.in b/providers/implementations/asymciphers/sm2_enc.inc.in index f545a6ab35f..7ad4185bc56 100644 --- a/providers/implementations/asymciphers/sm2_enc.inc.in +++ b/providers/implementations/asymciphers/sm2_enc.inc.in @@ -18,5 +18,4 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('sm2_set_ctx_params', (['OSSL_ASYM_CIPHER_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_ASYM_CIPHER_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ASYM_CIPHER_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], )); -} diff --git a/providers/implementations/include/prov/drbg.h b/providers/implementations/include/prov/drbg.h index e74ddd0717c..237ca41699f 100644 --- a/providers/implementations/include/prov/drbg.h +++ b/providers/implementations/include/prov/drbg.h @@ -242,7 +242,6 @@ int ossl_drbg_get_ctx_params_no_lock(PROV_DRBG *drbg, struct drbg_set_ctx_params_st { OSSL_PARAM *propq; - OSSL_PARAM *engine; OSSL_PARAM *cipher; /* CTR DRBG */ OSSL_PARAM *df; /* CTR DRBG */ OSSL_PARAM *digest; /* HASH and HMAC DRBG */ diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c index 3fe2c3ece80..d9dd9f06dad 100644 --- a/providers/implementations/kdfs/hkdf.c +++ b/providers/implementations/kdfs/hkdf.c @@ -264,7 +264,6 @@ static int kdf_hkdf_derive(void *vctx, unsigned char *key, size_t keylen, struct hkdf_all_set_ctx_params_st { OSSL_PARAM *mode; OSSL_PARAM *propq; - OSSL_PARAM *engine; OSSL_PARAM *digest; OSSL_PARAM *key; OSSL_PARAM *salt; diff --git a/providers/implementations/kdfs/hkdf.inc.in b/providers/implementations/kdfs/hkdf.inc.in index 32e5abf0b2f..7fd4f901309 100644 --- a/providers/implementations/kdfs/hkdf.inc.in +++ b/providers/implementations/kdfs/hkdf.inc.in @@ -19,7 +19,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); ); our @HKDF_DIGEST_SET_CTX_PARAMS = ( ['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ); our @HKDF_INFO_SET_CTX_PARAMS = ( diff --git a/providers/implementations/kdfs/hmacdrbg_kdf.inc.in b/providers/implementations/kdfs/hmacdrbg_kdf.inc.in index 699c9607187..19ed1ae3b6e 100644 --- a/providers/implementations/kdfs/hmacdrbg_kdf.inc.in +++ b/providers/implementations/kdfs/hmacdrbg_kdf.inc.in @@ -18,7 +18,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('hmac_drbg_kdf_set_ctx_params', (['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_KDF_PARAM_HMACDRBG_ENTROPY', 'ent', 'octet_string'], ['OSSL_KDF_PARAM_HMACDRBG_NONCE', 'nonce', 'octet_string'], diff --git a/providers/implementations/kdfs/kbkdf.inc.in b/providers/implementations/kdfs/kbkdf.inc.in index 1cecc84cfdd..0aabcfefeaf 100644 --- a/providers/implementations/kdfs/kbkdf.inc.in +++ b/providers/implementations/kdfs/kbkdf.inc.in @@ -21,7 +21,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); ['OSSL_KDF_PARAM_MAC', 'mac', 'utf8_string'], ['OSSL_KDF_PARAM_MODE', 'mode', 'utf8_string'], ['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_KBKDF_USE_L', 'use_l', 'int'], ['OSSL_KDF_PARAM_KBKDF_USE_SEPARATOR', 'sep', 'int'], ['OSSL_KDF_PARAM_KBKDF_R', 'r', 'int'], diff --git a/providers/implementations/kdfs/krb5kdf.inc.in b/providers/implementations/kdfs/krb5kdf.inc.in index 62124ec5b9c..c404d52125d 100644 --- a/providers/implementations/kdfs/krb5kdf.inc.in +++ b/providers/implementations/kdfs/krb5kdf.inc.in @@ -13,7 +13,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('krb5kdf_set_ctx_params', (['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_CIPHER', 'cipher', 'utf8_string'], ['OSSL_KDF_PARAM_KEY', 'key', 'octet_string'], ['OSSL_KDF_PARAM_CONSTANT', 'cnst', 'octet_string'], diff --git a/providers/implementations/kdfs/pbkdf1.inc.in b/providers/implementations/kdfs/pbkdf1.inc.in index 697042061ff..5cbab68ceee 100644 --- a/providers/implementations/kdfs/pbkdf1.inc.in +++ b/providers/implementations/kdfs/pbkdf1.inc.in @@ -13,7 +13,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('pbkdf1_set_ctx_params', (['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_KDF_PARAM_PASSWORD', 'pw', 'octet_string'], ['OSSL_KDF_PARAM_SALT', 'salt', 'octet_string'], diff --git a/providers/implementations/kdfs/pbkdf2.inc.in b/providers/implementations/kdfs/pbkdf2.inc.in index 94ea25a78a1..3bf8139ff53 100644 --- a/providers/implementations/kdfs/pbkdf2.inc.in +++ b/providers/implementations/kdfs/pbkdf2.inc.in @@ -13,7 +13,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('pbkdf2_set_ctx_params', (['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_KDF_PARAM_PASSWORD', 'pw', 'octet_string'], ['OSSL_KDF_PARAM_SALT', 'salt', 'octet_string'], diff --git a/providers/implementations/kdfs/pkcs12kdf.inc.in b/providers/implementations/kdfs/pkcs12kdf.inc.in index aebd403b3ac..7dce2c2eff2 100644 --- a/providers/implementations/kdfs/pkcs12kdf.inc.in +++ b/providers/implementations/kdfs/pkcs12kdf.inc.in @@ -13,7 +13,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('pkcs12_set_ctx_params', (['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_KDF_PARAM_PASSWORD', 'pw', 'octet_string'], ['OSSL_KDF_PARAM_SALT', 'salt', 'octet_string'], diff --git a/providers/implementations/kdfs/pvkkdf.inc.in b/providers/implementations/kdfs/pvkkdf.inc.in index 17dfa2f61e3..998497e5bd7 100644 --- a/providers/implementations/kdfs/pvkkdf.inc.in +++ b/providers/implementations/kdfs/pvkkdf.inc.in @@ -13,7 +13,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('pvk_set_ctx_params', (['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_KDF_PARAM_PASSWORD', 'pass', 'octet_string'], ['OSSL_KDF_PARAM_SALT', 'salt', 'octet_string'], diff --git a/providers/implementations/kdfs/sshkdf.inc.in b/providers/implementations/kdfs/sshkdf.inc.in index 85e1fdf951f..743edf4f5d0 100644 --- a/providers/implementations/kdfs/sshkdf.inc.in +++ b/providers/implementations/kdfs/sshkdf.inc.in @@ -13,7 +13,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('sshkdf_set_ctx_params', (['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_KDF_PARAM_KEY', 'key', 'octet_string'], ['OSSL_KDF_PARAM_SSHKDF_XCGHASH', 'xcg', 'octet_string'], diff --git a/providers/implementations/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c index 04018c48905..1e10e68868d 100644 --- a/providers/implementations/kdfs/sskdf.c +++ b/providers/implementations/kdfs/sskdf.c @@ -537,7 +537,6 @@ static int x963kdf_derive(void *vctx, unsigned char *key, size_t keylen, struct sskdf_all_set_ctx_params_st { OSSL_PARAM *secret; OSSL_PARAM *propq; - OSSL_PARAM *engine; OSSL_PARAM *digest; OSSL_PARAM *mac; OSSL_PARAM *salt; diff --git a/providers/implementations/kdfs/sskdf.inc.in b/providers/implementations/kdfs/sskdf.inc.in index a90d0ebf8fb..059e1794455 100644 --- a/providers/implementations/kdfs/sskdf.inc.in +++ b/providers/implementations/kdfs/sskdf.inc.in @@ -16,7 +16,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); ['OSSL_KDF_PARAM_KEY', 'secret', 'octet_string'], ['OSSL_KDF_PARAM_INFO', 'info', 'octet_string', SSKDF_MAX_INFOS], ['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_KDF_PARAM_MAC', 'mac', 'utf8_string'], ['OSSL_KDF_PARAM_SALT', 'salt', 'octet_string'], @@ -34,7 +33,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); ['OSSL_KDF_PARAM_KEY', 'secret', 'octet_string'], ['OSSL_KDF_PARAM_INFO', 'info', 'octet_string', SSKDF_MAX_INFOS], ['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_KDF_PARAM_MAC', 'mac', 'utf8_string'], ['OSSL_KDF_PARAM_SALT', 'salt', 'octet_string'], diff --git a/providers/implementations/kdfs/tls1_prf.inc.in b/providers/implementations/kdfs/tls1_prf.inc.in index 9f04f59861b..03583fcd050 100644 --- a/providers/implementations/kdfs/tls1_prf.inc.in +++ b/providers/implementations/kdfs/tls1_prf.inc.in @@ -13,7 +13,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('tls1prf_set_ctx_params', (['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_KDF_PARAM_SECRET', 'secret', 'octet_string'], ['OSSL_KDF_PARAM_SEED', 'seed', 'octet_string', TLSPRF_MAX_SEEDS], diff --git a/providers/implementations/kdfs/x942kdf.inc.in b/providers/implementations/kdfs/x942kdf.inc.in index 538bf2b3d2f..57c4a549c53 100644 --- a/providers/implementations/kdfs/x942kdf.inc.in +++ b/providers/implementations/kdfs/x942kdf.inc.in @@ -13,7 +13,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('sshkdf_set_ctx_params', (['OSSL_KDF_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_KDF_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_KDF_PARAM_SECRET', 'secret', 'octet_string'], ['OSSL_KDF_PARAM_KEY', 'secret', 'octet_string'], diff --git a/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/providers/implementations/keymgmt/mac_legacy_kmgmt.c index 21b450f04be..f4deb9edbec 100644 --- a/providers/implementations/keymgmt/mac_legacy_kmgmt.c +++ b/providers/implementations/keymgmt/mac_legacy_kmgmt.c @@ -186,7 +186,6 @@ struct mac_common_params_st { OSSL_PARAM *key; OSSL_PARAM *cipher; /* CMAC */ OSSL_PARAM *propq; - OSSL_PARAM *engine; }; #define mac_import_st mac_common_params_st diff --git a/providers/implementations/keymgmt/mac_legacy_kmgmt.inc.in b/providers/implementations/keymgmt/mac_legacy_kmgmt.inc.in index 3d9028710e7..be5ca7e4af5 100644 --- a/providers/implementations/keymgmt/mac_legacy_kmgmt.inc.in +++ b/providers/implementations/keymgmt/mac_legacy_kmgmt.inc.in @@ -19,7 +19,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('cmac_import', (['OSSL_PKEY_PARAM_PRIV_KEY', 'key', 'octet_string'], ['OSSL_PKEY_PARAM_CIPHER', 'cipher', 'utf8_string'], - ['OSSL_PKEY_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_PKEY_PARAM_PROPERTIES', 'propq', 'utf8_string'], )); -} @@ -30,7 +29,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('cmac_get_params', (['OSSL_PKEY_PARAM_PRIV_KEY', 'key', 'octet_string'], ['OSSL_PKEY_PARAM_CIPHER', 'cipher', 'utf8_string'], - ['OSSL_PKEY_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], )); -} {- produce_param_decoder('mac_set_params', @@ -45,5 +43,4 @@ use OpenSSL::paramnames qw(produce_param_decoder); (['OSSL_PKEY_PARAM_PRIV_KEY', 'key', 'octet_string'], ['OSSL_PKEY_PARAM_CIPHER', 'cipher', 'utf8_string'], ['OSSL_PKEY_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_PKEY_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], )); -} diff --git a/providers/implementations/macs/cmac_prov.inc.in b/providers/implementations/macs/cmac_prov.inc.in index 36e2117c36b..e82beaa1aa2 100644 --- a/providers/implementations/macs/cmac_prov.inc.in +++ b/providers/implementations/macs/cmac_prov.inc.in @@ -19,7 +19,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('cmac_set_ctx_params', (['OSSL_MAC_PARAM_CIPHER', 'cipher', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_MAC_PARAM_PROPERTIES', 'propq', 'utf8_string'], ['OSSL_MAC_PARAM_KEY', 'key', 'octet_string'], ['OSSL_CIPHER_PARAM_FIPS_ENCRYPT_CHECK', 'ind_ec', 'int', 'fips'], diff --git a/providers/implementations/macs/gmac_prov.inc.in b/providers/implementations/macs/gmac_prov.inc.in index edf049f29ce..5a6dfa67487 100644 --- a/providers/implementations/macs/gmac_prov.inc.in +++ b/providers/implementations/macs/gmac_prov.inc.in @@ -17,7 +17,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('gmac_set_ctx_params', (['OSSL_MAC_PARAM_CIPHER', 'cipher', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_MAC_PARAM_PROPERTIES', 'propq', 'utf8_string'], ['OSSL_MAC_PARAM_KEY', 'key', 'octet_string'], ['OSSL_MAC_PARAM_IV', 'iv', 'octet_string'], diff --git a/providers/implementations/macs/hmac_prov.inc.in b/providers/implementations/macs/hmac_prov.inc.in index fd1dda6f42b..4e4f15f81dd 100644 --- a/providers/implementations/macs/hmac_prov.inc.in +++ b/providers/implementations/macs/hmac_prov.inc.in @@ -19,7 +19,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('hmac_set_ctx_params', (['OSSL_MAC_PARAM_DIGEST', 'digest', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_MAC_PARAM_PROPERTIES', 'propq', 'utf8_string'], ['OSSL_MAC_PARAM_KEY', 'key', 'octet_string'], ['OSSL_MAC_PARAM_TLS_DATA_SIZE', 'tlssize', 'size_t'], diff --git a/providers/implementations/macs/kmac_prov.inc.in b/providers/implementations/macs/kmac_prov.inc.in index 1089ef8b68e..56ccd75c8b7 100644 --- a/providers/implementations/macs/kmac_prov.inc.in +++ b/providers/implementations/macs/kmac_prov.inc.in @@ -14,7 +14,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('kmac_new', (['OSSL_MAC_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_MAC_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], )); -} {- produce_param_decoder('kmac_get_ctx_params', diff --git a/providers/implementations/rands/drbg_hash.inc.in b/providers/implementations/rands/drbg_hash.inc.in index 5983813fac3..695071a152c 100644 --- a/providers/implementations/rands/drbg_hash.inc.in +++ b/providers/implementations/rands/drbg_hash.inc.in @@ -31,7 +31,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('drbg_hash_set_ctx_params', (['OSSL_DRBG_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_DRBG_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_PROV_PARAM_CORE_PROV_NAME', 'prov', 'utf8_string'], ['OSSL_DRBG_PARAM_RESEED_REQUESTS', 'reseed_req', 'uint'], diff --git a/providers/implementations/rands/drbg_hmac.inc.in b/providers/implementations/rands/drbg_hmac.inc.in index 53f81410f3b..360fb6808ad 100644 --- a/providers/implementations/rands/drbg_hmac.inc.in +++ b/providers/implementations/rands/drbg_hmac.inc.in @@ -31,7 +31,6 @@ use OpenSSL::paramnames qw(produce_param_decoder); {- produce_param_decoder('drbg_hmac_set_ctx_params', (['OSSL_DRBG_PARAM_PROPERTIES', 'propq', 'utf8_string'], - ['OSSL_ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['OSSL_DRBG_PARAM_DIGEST', 'digest', 'utf8_string'], ['OSSL_PROV_PARAM_CORE_PROV_NAME', 'prov', 'utf8_string'], ['OSSL_DRBG_PARAM_RESEED_REQUESTS', 'reseed_req', 'uint'],