diff options
| author | Johannes Bauer <joe@johannes-bauer.com> | 2017-07-22 20:04:55 +0200 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2017-08-08 15:44:49 +0100 |
| commit | cefa762ee5c28359986c6af5bf4db4e901f75846 (patch) | |
| tree | 6b55f77ca5b546c50f3010a8757d0e9e39ce3972 /crypto/include | |
| parent | 9ed79d8ee1ef845fce94739787d45ad03f675eaa (diff) | |
Add interface to the scrypt KDF by means of PKEY_METHOD
Add an interface that allows accessing the scrypt KDF as a PKEY_METHOD.
This fixes #4021 (at least for the scrypt portion of the issue).
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Stephen Henson <steve@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4026)
Diffstat (limited to 'crypto/include')
| -rw-r--r-- | crypto/include/internal/evp_int.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/include/internal/evp_int.h b/crypto/include/internal/evp_int.h index 635e7b5b87..be1b9be926 100644 --- a/crypto/include/internal/evp_int.h +++ b/crypto/include/internal/evp_int.h @@ -91,6 +91,7 @@ extern const EVP_PKEY_METHOD ed25519_pkey_meth; extern const EVP_PKEY_METHOD hmac_pkey_meth; extern const EVP_PKEY_METHOD rsa_pkey_meth; extern const EVP_PKEY_METHOD rsa_pss_pkey_meth; +extern const EVP_PKEY_METHOD scrypt_pkey_meth; extern const EVP_PKEY_METHOD tls1_prf_pkey_meth; extern const EVP_PKEY_METHOD hkdf_pkey_meth; extern const EVP_PKEY_METHOD poly1305_pkey_meth; |