diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-09-19 11:47:46 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-09-20 08:28:47 +0200 |
| commit | 4e8b8e47c85a45d1bda3241d7b2852d82db2a255 (patch) | |
| tree | 6141920db7bb6b798bf44eb14dc343d9634bc8c9 /include | |
| parent | ca392b294359a8e9ca55e685b344b485d02bc93b (diff) | |
Refactor TLS-PRF's kdf_tls1_prf_mkmacctx() to a provider utility
ossl_prov_macctx_load_from_params() creates a EVP_MAC_CTX *, or sets
new common parameters for an existing one.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9946)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/core_names.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h index e1bc43d8db..ad4cf50bb5 100644 --- a/include/openssl/core_names.h +++ b/include/openssl/core_names.h @@ -47,6 +47,7 @@ extern "C" { */ #define OSSL_ALG_PARAM_DIGEST "digest" /* utf8_string */ #define OSSL_ALG_PARAM_CIPHER "cipher" /* utf8_string */ +#define OSSL_ALG_PARAM_MAC "mac" /* utf8_string */ #define OSSL_ALG_PARAM_ENGINE "engine" /* utf8_string */ #define OSSL_ALG_PARAM_PROPERTIES "properties"/* utf8_string */ @@ -108,8 +109,8 @@ extern "C" { #define OSSL_KDF_PARAM_KEY "key" /* octet string */ #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_MAC "mac" /* utf8 string */ +#define OSSL_KDF_PARAM_DIGEST OSSL_ALG_PARAM_DIGEST /* 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_ENGINE OSSL_ALG_PARAM_ENGINE /* utf8 string */ #define OSSL_KDF_PARAM_PROPERTIES OSSL_ALG_PARAM_PROPERTIES /* utf8 string */ |