diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2015-01-30 16:08:18 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2015-05-21 12:48:02 +0100 |
commit | 96b96d6c456befe49d5845a029e2bb0a4addc58d (patch) | |
tree | bb29f26b1389e532df11949d90a2392d67a42c3a /crypto/objects/objects.txt | |
parent | 3e8e688f867a1ec1e554da67f111fa58a6ee1138 (diff) | |
download | openssl-96b96d6c456befe49d5845a029e2bb0a4addc58d.tar.gz |
Add scrypt OID from draft-josefsson-scrypt-kdf-03
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/objects/objects.txt')
-rw-r--r-- | crypto/objects/objects.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt index 25a9bb88aa..655f40514b 100644 --- a/crypto/objects/objects.txt +++ b/crypto/objects/objects.txt @@ -1360,3 +1360,6 @@ secg-scheme 14 3 : dhSinglePass-cofactorDH-sha512kdf-scheme 1 3 6 1 4 1 311 60 2 1 1 : jurisdictionL : jurisdictionLocalityName 1 3 6 1 4 1 311 60 2 1 2 : jurisdictionST : jurisdictionStateOrProvinceName 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 |