kdfs: make the 'engine' parameter hidden

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)

diff --git a/providers/implementations/kdfs/hkdf.c.in b/providers/implementations/kdfs/hkdf.c.in
index e392f3d5c2da4118adf1000019db8811dea7a2d0..f91f7928df76913a31f1a487891983fc6726172a 100644 (file)
--- a/providers/implementations/kdfs/hkdf.c.in
+++ b/providers/implementations/kdfs/hkdf.c.in
@@ -356,7 +356,7 @@ static int hkdf_common_set_ctx_params
                          (['KDF_PARAM_MODE',           'mode',   'utf8_string'],
                           ['KDF_PARAM_MODE',           'mode',   'int'],
                           ['KDF_PARAM_PROPERTIES',     'propq',  'utf8_string'],
-                          ['ALG_PARAM_ENGINE',         'engine', 'utf8_string'],
+                          ['ALG_PARAM_ENGINE',         'engine', 'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',         'digest', 'utf8_string'],
                           ['KDF_PARAM_KEY',            'key',    'octet_string'],
                           ['KDF_PARAM_SALT',           'salt',   'octet_string'],
@@ -967,7 +967,7 @@ static int kdf_tls1_3_derive(void *vctx, unsigned char *key, size_t keylen,
                          (['KDF_PARAM_MODE',              'mode',   'utf8_string'],
                           ['KDF_PARAM_MODE',              'mode',   'int'],
                           ['KDF_PARAM_PROPERTIES',        'propq',  'utf8_string'],
-                          ['ALG_PARAM_ENGINE',            'engine', 'utf8_string'],
+                          ['ALG_PARAM_ENGINE',            'engine', 'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',            'digest', 'utf8_string'],
                           ['KDF_PARAM_KEY',               'key',    'octet_string'],
                           ['KDF_PARAM_SALT',              'salt',   'octet_string'],

diff --git a/providers/implementations/kdfs/hmacdrbg_kdf.c.in b/providers/implementations/kdfs/hmacdrbg_kdf.c.in
index effadd01291d201bf1bc552c4042f25d2092d289..b77771f7d99df0dfadd252bea2fca6ccb96ab247 100644 (file)
--- a/providers/implementations/kdfs/hmacdrbg_kdf.c.in
+++ b/providers/implementations/kdfs/hmacdrbg_kdf.c.in
@@ -181,7 +181,7 @@ static const OSSL_PARAM *hmac_drbg_kdf_gettable_ctx_params(
 
 {- produce_param_decoder('hmac_drbg_kdf_set_ctx_params',
                          (['KDF_PARAM_PROPERTIES',       'propq',  'utf8_string'],
-                          ['ALG_PARAM_ENGINE',           'engine', 'utf8_string'],
+                          ['ALG_PARAM_ENGINE',           'engine', 'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',           'digest', 'utf8_string'],
                           ['KDF_PARAM_HMACDRBG_ENTROPY', 'ent',    'octet_string'],
                           ['KDF_PARAM_HMACDRBG_NONCE',   'nonce',  'octet_string'],

diff --git a/providers/implementations/kdfs/kbkdf.c.in b/providers/implementations/kdfs/kbkdf.c.in
index e3f08acbcfd4054d026e0c06b388d02421075917..0e2083d486b238ff5a7a83b188534b0f585f886a 100644 (file)
--- a/providers/implementations/kdfs/kbkdf.c.in
+++ b/providers/implementations/kdfs/kbkdf.c.in
@@ -378,7 +378,7 @@ done:
                           ['KDF_PARAM_MAC',                 'mac',    'utf8_string'],
                           ['KDF_PARAM_MODE',                'mode',   'utf8_string'],
                           ['KDF_PARAM_PROPERTIES',          'propq',  'utf8_string'],
-                          ['ALG_PARAM_ENGINE',              'engine', 'utf8_string'],
+                          ['ALG_PARAM_ENGINE',              'engine', 'utf8_string', 'hidden'],
                           ['KDF_PARAM_KBKDF_USE_L',         'use_l',  'int'],
                           ['KDF_PARAM_KBKDF_USE_SEPARATOR', 'sep',    'int'],
                           ['KDF_PARAM_KBKDF_R',             'r',      'int'],

diff --git a/providers/implementations/kdfs/krb5kdf.c.in b/providers/implementations/kdfs/krb5kdf.c.in
index 25883cd68e6e9c5bcd9a4e0e3b218da6bb07e709..14c6f0c8ec01ec3cd780766663a4075cab63725b 100644 (file)
--- a/providers/implementations/kdfs/krb5kdf.c.in
+++ b/providers/implementations/kdfs/krb5kdf.c.in
@@ -156,7 +156,7 @@ static int krb5kdf_derive(void *vctx, unsigned char *key, size_t keylen,
 
 {- produce_param_decoder('krb5kdf_set_ctx_params',
                          (['KDF_PARAM_PROPERTIES',  'propq',    'utf8_string'],
-                          ['ALG_PARAM_ENGINE',      'engine',   'utf8_string'],
+                          ['ALG_PARAM_ENGINE',      'engine',   'utf8_string', 'hidden'],
                           ['KDF_PARAM_CIPHER',      'cipher',   'utf8_string'],
                           ['KDF_PARAM_KEY',         'key',      'octet_string'],
                           ['KDF_PARAM_CONSTANT',    'cnst',     'octet_string'],

diff --git a/providers/implementations/kdfs/pbkdf1.c.in b/providers/implementations/kdfs/pbkdf1.c.in
index ea3baae76e18f529bb499e22de984d9e48bc2d9c..9e5a39d27a40ea64c71a0e6149a11ec69ecdb7ec 100644 (file)
--- a/providers/implementations/kdfs/pbkdf1.c.in
+++ b/providers/implementations/kdfs/pbkdf1.c.in
@@ -204,7 +204,7 @@ static int kdf_pbkdf1_derive(void *vctx, unsigned char *key, size_t keylen,
 
 {- produce_param_decoder('pbkdf1_set_ctx_params',
                          (['KDF_PARAM_PROPERTIES',  'propq',    'utf8_string'],
-                          ['ALG_PARAM_ENGINE',      'engine',   'utf8_string'],
+                          ['ALG_PARAM_ENGINE',      'engine',   'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',      'digest',   'utf8_string'],
                           ['KDF_PARAM_PASSWORD',    'pw',       'octet_string'],
                           ['KDF_PARAM_SALT',        'salt',     'octet_string'],

diff --git a/providers/implementations/kdfs/pbkdf2.c.in b/providers/implementations/kdfs/pbkdf2.c.in
index c12723196e89669d2b58dd6c4b2930de9e774fee..c40879041fdf92c99ad22e7deeb49a127bede695 100644 (file)
--- a/providers/implementations/kdfs/pbkdf2.c.in
+++ b/providers/implementations/kdfs/pbkdf2.c.in
@@ -281,7 +281,7 @@ static int kdf_pbkdf2_derive(void *vctx, unsigned char *key, size_t keylen,
 
 {- produce_param_decoder('pbkdf2_set_ctx_params',
                          (['KDF_PARAM_PROPERTIES',  'propq',    'utf8_string'],
-                          ['ALG_PARAM_ENGINE',      'engine',   'utf8_string'],
+                          ['ALG_PARAM_ENGINE',      'engine',   'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',      'digest',   'utf8_string'],
                           ['KDF_PARAM_PASSWORD',    'pw',       'octet_string'],
                           ['KDF_PARAM_SALT',        'salt',     'octet_string'],

diff --git a/providers/implementations/kdfs/pkcs12kdf.c.in b/providers/implementations/kdfs/pkcs12kdf.c.in
index 80da82c60a518f683e59e9096afd4573356761e1..b607c6e2b24e0973a8f231cbea3e7bfdd34f4be9 100644 (file)
--- a/providers/implementations/kdfs/pkcs12kdf.c.in
+++ b/providers/implementations/kdfs/pkcs12kdf.c.in
@@ -245,7 +245,7 @@ static int kdf_pkcs12_derive(void *vctx, unsigned char *key, size_t keylen,
 
 {- produce_param_decoder('pkcs12_set_ctx_params',
                          (['KDF_PARAM_PROPERTIES',  'propq',    'utf8_string'],
-                          ['ALG_PARAM_ENGINE',      'engine',   'utf8_string'],
+                          ['ALG_PARAM_ENGINE',      'engine',   'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',      'digest',   'utf8_string'],
                           ['KDF_PARAM_PASSWORD',    'pw',       'octet_string'],
                           ['KDF_PARAM_SALT',        'salt',     'octet_string'],

diff --git a/providers/implementations/kdfs/pvkkdf.c.in b/providers/implementations/kdfs/pvkkdf.c.in
index 2ce8d2ebc7822a07c97e4d61f230289105e7378f..4b705cb8a4362f45c02386ab43513e0c4dd5c91f 100644 (file)
--- a/providers/implementations/kdfs/pvkkdf.c.in
+++ b/providers/implementations/kdfs/pvkkdf.c.in
@@ -183,7 +183,7 @@ static int kdf_pvk_derive(void *vctx, unsigned char *key, size_t keylen,
 
 {- produce_param_decoder('pvk_set_ctx_params',
                          (['KDF_PARAM_PROPERTIES',  'propq',    'utf8_string'],
-                          ['ALG_PARAM_ENGINE',      'engine',   'utf8_string'],
+                          ['ALG_PARAM_ENGINE',      'engine',   'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',      'digest',   'utf8_string'],
                           ['KDF_PARAM_PASSWORD',    'pass',     'octet_string'],
                           ['KDF_PARAM_SALT',        'salt',     'octet_string'],

diff --git a/providers/implementations/kdfs/sshkdf.c.in b/providers/implementations/kdfs/sshkdf.c.in
index 3cfc70ce5e87f6e641d91ca13eab347cc1d7363f..de2b58b6b714d6c9c0a0e3e7b28a33d47746bda4 100644 (file)
--- a/providers/implementations/kdfs/sshkdf.c.in
+++ b/providers/implementations/kdfs/sshkdf.c.in
@@ -211,7 +211,7 @@ static int kdf_sshkdf_derive(void *vctx, unsigned char *key, size_t keylen,
 
 {- produce_param_decoder('sshkdf_set_ctx_params',
                          (['KDF_PARAM_PROPERTIES',        'propq',   'utf8_string'],
-                          ['ALG_PARAM_ENGINE',            'engine',  'utf8_string'],
+                          ['ALG_PARAM_ENGINE',            'engine',  'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',            'digest',  'utf8_string'],
                           ['KDF_PARAM_KEY',               'key',     'octet_string'],
                           ['KDF_PARAM_SSHKDF_XCGHASH',    'xcg',     'octet_string'],

diff --git a/providers/implementations/kdfs/sskdf.c.in b/providers/implementations/kdfs/sskdf.c.in
index b9545e2837d2e7474bb71a31cf1450c6791e677b..8371ff1fcf077fba883bcd0766d6aa46a101aa80 100644 (file)
--- a/providers/implementations/kdfs/sskdf.c.in
+++ b/providers/implementations/kdfs/sskdf.c.in
@@ -617,7 +617,7 @@ static int sskdf_common_set_ctx_params
                           ['KDF_PARAM_KEY',            'key',    'octet_string'],
                           ['KDF_PARAM_INFO',           'info',   'octet_string', SSKDF_MAX_INFOS],
                           ['KDF_PARAM_PROPERTIES',     'propq',  'utf8_string'],
-                          ['ALG_PARAM_ENGINE',         'engine', 'utf8_string'],
+                          ['ALG_PARAM_ENGINE',         'engine', 'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',         'digest', 'utf8_string'],
                           ['KDF_PARAM_MAC',            'mac',    'utf8_string'],
                           ['KDF_PARAM_SALT',           'salt',   'octet_string'],
@@ -691,7 +691,7 @@ static const OSSL_PARAM *sskdf_common_gettable_ctx_params
                           ['KDF_PARAM_KEY',               'key',    'octet_string'],
                           ['KDF_PARAM_INFO',              'info',   'octet_string', SSKDF_MAX_INFOS],
                           ['KDF_PARAM_PROPERTIES',        'propq',  'utf8_string'],
-                          ['ALG_PARAM_ENGINE',            'engine', 'utf8_string'],
+                          ['ALG_PARAM_ENGINE',            'engine', 'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',            'digest', 'utf8_string'],
                           ['KDF_PARAM_MAC',               'mac',    'utf8_string'],
                           ['KDF_PARAM_SALT',              'salt',   'octet_string'],

diff --git a/providers/implementations/kdfs/tls1_prf.c.in b/providers/implementations/kdfs/tls1_prf.c.in
index 04c02609f63b36958e127e181327c1bb9fa826a3..c7768ef46e8e4d7a63cb9bf08948d4db61fe109b 100644 (file)
--- a/providers/implementations/kdfs/tls1_prf.c.in
+++ b/providers/implementations/kdfs/tls1_prf.c.in
@@ -286,7 +286,7 @@ static int kdf_tls1_prf_derive(void *vctx, unsigned char *key, size_t keylen,
 
 {- produce_param_decoder('tls1prf_set_ctx_params',
                          (['KDF_PARAM_PROPERTIES',        'propq',  'utf8_string'],
-                          ['ALG_PARAM_ENGINE',            'engine', 'utf8_string'],
+                          ['ALG_PARAM_ENGINE',            'engine', 'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',            'digest', 'utf8_string'],
                           ['KDF_PARAM_SECRET',            'secret', 'octet_string'],
                           ['KDF_PARAM_SEED',              'seed',   'octet_string', 6],

diff --git a/providers/implementations/kdfs/x942kdf.c.in b/providers/implementations/kdfs/x942kdf.c.in
index 58c239e6cd730cb5e2c8546350ab18ffcab63cc8..72178568827db6a924ebeea67e2d205ead27f090 100644 (file)
--- a/providers/implementations/kdfs/x942kdf.c.in
+++ b/providers/implementations/kdfs/x942kdf.c.in
@@ -531,7 +531,7 @@ static int x942kdf_derive(void *vctx, unsigned char *key, size_t keylen,
 
 {- produce_param_decoder('sshkdf_set_ctx_params',
                          (['KDF_PARAM_PROPERTIES',          'propq',    'utf8_string'],
-                          ['ALG_PARAM_ENGINE',              'engine',   'utf8_string'],
+                          ['ALG_PARAM_ENGINE',              'engine',   'utf8_string', 'hidden'],
                           ['KDF_PARAM_DIGEST',              'digest',   'utf8_string'],
                           ['KDF_PARAM_SECRET',              'secret',   'octet_string'],
                           ['KDF_PARAM_KEY',                 'key',      'octet_string'],