diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-01-04 18:41:21 +1000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2019-03-19 11:03:45 +0000 |
| commit | 9537fe5757bb07761fa275d779bbd40bcf5530e4 (patch) | |
| tree | cb748da879a7b00b758b710daed725113b839844 /include/openssl/kdf.h | |
| parent | 6098b69e5817068c49e63487d3424b4122a1796d (diff) | |
| download | openssl-new-9537fe5757bb07761fa275d779bbd40bcf5530e4.tar.gz | |
Single step kdf implementation
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8230)
Diffstat (limited to 'include/openssl/kdf.h')
| -rw-r--r-- | include/openssl/kdf.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index acd94491b3..3a14662800 100644 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -23,6 +23,7 @@ extern "C" { # define EVP_KDF_TLS1_PRF NID_tls1_prf # define EVP_KDF_HKDF NID_hkdf # define EVP_KDF_SSHKDF NID_sshkdf +# define EVP_KDF_SS NID_sskdf EVP_KDF_CTX *EVP_KDF_CTX_new_id(int id); void EVP_KDF_CTX_free(EVP_KDF_CTX *ctx); @@ -53,6 +54,9 @@ int EVP_KDF_derive(EVP_KDF_CTX *ctx, unsigned char *key, size_t keylen); # define EVP_KDF_CTRL_SET_SSHKDF_XCGHASH 0x10 /* unsigned char *, size_t */ # define EVP_KDF_CTRL_SET_SSHKDF_SESSION_ID 0x11 /* unsigned char *, size_t */ # define EVP_KDF_CTRL_SET_SSHKDF_TYPE 0x12 /* int */ +# define EVP_KDF_CTRL_SET_MAC 0x13 /* EVP_MAC * */ +# define EVP_KDF_CTRL_SET_MAC_SIZE 0x14 /* size_t */ +# define EVP_KDF_CTRL_SET_SSKDF_INFO 0x15 /* unsigned char *, size_t */ # define EVP_KDF_HKDF_MODE_EXTRACT_AND_EXPAND 0 # define EVP_KDF_HKDF_MODE_EXTRACT_ONLY 1 |