projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Add interface to the scrypt KDF by means of PKEY_METHOD
[openssl.git]
/
crypto
/
objects
/
objects.txt
diff --git
a/crypto/objects/objects.txt
b/crypto/objects/objects.txt
index 8f17cc4a448a01a49b4a27948c8a5e0074e00e8f..7464d670e97dc70f43167803118051ef7992340a 100644
(file)
--- 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