Providers: Remove OSSL_ALG_PARAM_ENGINE

Resolves: https://github.com/openssl/project/issues/1427

Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Paul Yang <paulyang.inf@gmail.com>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29305)

diff --git a/providers/implementations/asymciphers/sm2_enc.inc.in b/providers/implementations/asymciphers/sm2_enc.inc.in
index f545a6ab35ffc8a11facbf160756dc7da36f8256..7ad4185bc56621df1ed3366e937b9b0c67da01c2 100644 (file)
--- 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 e74ddd0717cd77e96782eb4bff673ebd86194472..237ca41699fe48300fe246022a5b3d05c41c2a8b 100644 (file)
--- 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 3fe2c3ece80b84bfded2f325d2fdd4e4ce3d2b06..d9dd9f06dad3052b8e0b46e4047b2df4438b78b4 100644 (file)
--- 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 32e5abf0b2fbf3493593b2a1bbbd245f923496ac..7fd4f901309af0b65f35a1f4515e37553020881f 100644 (file)
--- 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 699c9607187de5d95621674be25bf5a56ccc2229..19ed1ae3b6ef8c015712832c0627e93d4271d6fa 100644 (file)
--- 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 1cecc84cfdd674dda4b5c1d49c17746ae84a6195..0aabcfefeafbdc8b8e8e0821e552300d1ccabd5d 100644 (file)
--- 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 62124ec5b9c4d88bfcf25e2dbdf6ed41dfafc157..c404d52125d9de4a4df7a38f2078ada259e8e1a2 100644 (file)
--- 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 697042061ff02e51f91c4a62611f5b009a7d74d0..5cbab68ceee2dfe0f297a8e60b2d2dbe60e76a96 100644 (file)
--- 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 94ea25a78a1e0c22492e78abfa9bdf68e5bff201..3bf8139ff533006000fd8e527f891a6cb102eb44 100644 (file)
--- 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 aebd403b3ac61b734f060e53239bc55883f164f7..7dce2c2eff23586e30bf845e215cb7dd049e8e83 100644 (file)
--- 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 17dfa2f61e386d9571064fe1239451e5fc9e50ce..998497e5bd7541b2c3b3703d2cc72fdfcfe6300e 100644 (file)
--- 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 85e1fdf951f6d5bfcd183737b089f55f6c3913fe..743edf4f5d047058a32686e3abee7d4feceac343 100644 (file)
--- 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 04018c48905084e46a903e00c35c2cf76e9bf2fe..1e10e68868dc22e148fc244dd692d94f4e46ad01 100644 (file)
--- 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 a90d0ebf8fbd8efb88476a27043f0361400162e7..059e1794455f169e674ad8d220dba9376bca80e5 100644 (file)
--- 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 9f04f59861b6bb86db8b63c0537c52dae5385034..03583fcd050b6ad3b426eaef0933a793c143ce50 100644 (file)
--- 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 538bf2b3d2f403f89bb1cf6f806030ed8ba176e4..57c4a549c53314032d71281eb1042db30d44d492 100644 (file)
--- 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 21b450f04bed192589c0ee021b35bb105143abbf..f4deb9edbecaf4797e77f346156749cd1ac4ceb8 100644 (file)
--- 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 3d9028710e71e8ac2689f458118777f5a718af60..be5ca7e4af5ada951d4d668e5df5b655f1de5455 100644 (file)
--- 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 36e2117c36ba0408d9cab568030d2c304ff74b3a..e82beaa1aa2e7cd122a9ed79cbe7ab969150f21e 100644 (file)
--- 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 edf049f29ce6c73b5093a1c1e3a1ec14dbf12ed8..5a6dfa67487f06db55816f136ad115052b0a889c 100644 (file)
--- 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 fd1dda6f42b2949d2f21d68ecd77421c7f287e3e..4e4f15f81dddd46830a0927205aa02de13ba06c8 100644 (file)
--- 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 1089ef8b68eb1192257558fc315db43365593b50..56ccd75c8b74e8babfda0030b220c15769d28f58 100644 (file)
--- 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 5983813fac36f11b32d6ddab42ad32305f2976d0..695071a152cc981927f96fd50fd69597e1ed02ab 100644 (file)
--- 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 53f81410f3bba2e81bc74902dd099530974d65c5..360fb6808adb562b2e3c7d5cd6d141b034a53d1d 100644 (file)
--- 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'],