diff options
| author | Robbie Harwood <rharwood@redhat.com> | 2019-10-17 12:45:03 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-10-17 12:45:03 +1000 |
| commit | f6dead1b72a04b113b4b198ac98a8b9b994ad86f (patch) | |
| tree | 2b8869a78f16f0035fc6707440812b2dcc5ac516 /include | |
| parent | 028687c08b20ecc463afaf2d692542b88ebfe8bc (diff) | |
[KDF] Add feedback-mode and CMAC support to KBKDF
Implement SP800-108 section 5.2 with CMAC support. As a side effect,
enable 5.1 with CMAC and 5.2 with HMAC. Add test vectors from RFC 6803.
Add OSSL_KDF_PARAM_CIPHER and PROV_R_INVALID_SEED_LENGTH.
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10143)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/core_names.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h index d9ef31cff0..f0e6334d89 100644 --- a/include/openssl/core_names.h +++ b/include/openssl/core_names.h @@ -114,6 +114,7 @@ extern "C" { #define OSSL_KDF_PARAM_SALT "salt" /* octet string */ #define OSSL_KDF_PARAM_PASSWORD "pass" /* octet string */ #define OSSL_KDF_PARAM_DIGEST OSSL_ALG_PARAM_DIGEST /* utf8 string */ +#define OSSL_KDF_PARAM_CIPHER OSSL_ALG_PARAM_CIPHER /* utf8 string */ #define OSSL_KDF_PARAM_MAC OSSL_ALG_PARAM_MAC /* utf8 string */ #define OSSL_KDF_PARAM_MAC_SIZE "maclen" /* size_t */ #define OSSL_KDF_PARAM_PROPERTIES OSSL_ALG_PARAM_PROPERTIES /* utf8 string */ |