diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-08-30 15:36:20 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2019-09-06 19:27:57 +1000 |
| commit | ff756eedb3b28964ac8e7a7825198ac1b26dfb98 (patch) | |
| tree | 08cd209a15874ce2b8ca2c144f6ef40db3379425 /include | |
| parent | b1f15129933fdc98134ef2fcafb1ecea710f5920 (diff) | |
More KDF cleanup
The EVP_KDF_ definitions are no longer needed, and neither is
EVP_get_kdfbyname()
test/evp_kdf_test.c tried to use a EVP_get_kdfbyname() that was rewritten
to use EVP_KDF_fetch() without ever freeing the resulting KDF method.
It's better to refactor the test to use EVP_KDF_fetch directly.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9662)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/kdf.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index d76b39e65e..a9ea768d1d 100644 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -19,20 +19,10 @@ extern "C" { # endif -# define EVP_KDF_PBKDF2 NID_id_pbkdf2 -# define EVP_KDF_SCRYPT NID_id_scrypt -# 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 -# define EVP_KDF_X963 NID_x963kdf -# define EVP_KDF_X942 NID_x942kdf - int EVP_KDF_up_ref(EVP_KDF *kdf); void EVP_KDF_free(EVP_KDF *kdf); EVP_KDF *EVP_KDF_fetch(OPENSSL_CTX *libctx, const char *algorithm, const char *properties); -#define EVP_get_kdfbyname(name) EVP_KDF_fetch(NULL, (name), NULL) EVP_KDF_CTX *EVP_KDF_CTX_new(EVP_KDF *kdf); void EVP_KDF_CTX_free(EVP_KDF_CTX *ctx); |