From: Pauli Date: Thu, 3 Jul 2025 03:07:48 +0000 (+1000) Subject: kdfs: make the 'engine' parameter hidden X-Git-Tag: openssl-3.6.0-alpha1~297 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f852b874653f359b7a5276f447d3f319d1440a6e;p=thirdparty%2Fopenssl.git kdfs: make the 'engine' parameter hidden Reviewed-by: Shane Lontis Reviewed-by: Tomas Mraz (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 e392f3d5c2d..f91f7928df7 100644 --- 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 effadd01291..b77771f7d99 100644 --- 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 e3f08acbcfd..0e2083d486b 100644 --- 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 25883cd68e6..14c6f0c8ec0 100644 --- 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 ea3baae76e1..9e5a39d27a4 100644 --- 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 c12723196e8..c40879041fd 100644 --- 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 80da82c60a5..b607c6e2b24 100644 --- 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 2ce8d2ebc78..4b705cb8a43 100644 --- 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 3cfc70ce5e8..de2b58b6b71 100644 --- 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 b9545e2837d..8371ff1fcf0 100644 --- 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 04c02609f63..c7768ef46e8 100644 --- 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 58c239e6cd7..72178568827 100644 --- 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'],