diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-10-28 15:33:05 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-11-11 12:15:18 +1000 |
| commit | 4757a3475191b84954f8fa15202de44c8dbb5ea3 (patch) | |
| tree | 98160f98ca1a238f90f7f7a30da3f3668a512945 /include | |
| parent | 2c90e80dec299c3307a968ec21838aeabd7bb2c9 (diff) | |
Add support for making all of KBKDF FixedInput fields optional.
Added settable integer parameters OSSL_KDF_PARAM_KBKDF_USE_L, OSSL_KDF_PARAM_KBKDF_USE_SEPARATOR.
This is required for CAVS tests that only use a combined blob of
inputdata. A test showing this use case has been added.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13258)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/core_names.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h index 6a50f10da7..43be4ae145 100644 --- a/include/openssl/core_names.h +++ b/include/openssl/core_names.h @@ -200,6 +200,8 @@ extern "C" { #define OSSL_KDF_PARAM_CIPHER OSSL_ALG_PARAM_CIPHER /* utf8 string */ #define OSSL_KDF_PARAM_CONSTANT "constant" /* octet string */ #define OSSL_KDF_PARAM_PKCS12_ID "id" /* int */ +#define OSSL_KDF_PARAM_KBKDF_USE_L "use-l" /* int */ +#define OSSL_KDF_PARAM_KBKDF_USE_SEPARATOR "use-separator" /* int */ /* Known KDF names */ #define OSSL_KDF_NAME_HKDF "HKDF" |