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/objects/objects.txt | |
| 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/objects/objects.txt')
| -rw-r--r-- | crypto/objects/objects.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 8f17cc4a44..7464d670e9 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1524,7 +1524,8 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme 1 3 6 1 4 1 311 60 2 1 3 : jurisdictionC : jurisdictionCountryName # SCRYPT algorithm -1 3 6 1 4 1 11591 4 11 : id-scrypt +!Cname id-scrypt +1 3 6 1 4 1 11591 4 11 : id-scrypt : scrypt # NID for TLS1 PRF : TLS1-PRF : tls1-prf |