diff options
| author | Jack Lloyd <[email protected]> | 2018-05-15 22:24:59 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-05-16 10:33:52 -0400 |
| commit | 556aac9cd7362d959ada085222f1e0e940f94cdd (patch) | |
| tree | 17bd7fef0100fab77195d9e3423dc3f5400a2d2c /src/lib/asn1 | |
| parent | 1edd844d4b59867e2dbbf135bc754dc220f375e3 (diff) | |
Add Scrypt key dervation function
Diffstat (limited to 'src/lib/asn1')
| -rw-r--r-- | src/lib/asn1/oid_maps.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/asn1/oid_maps.cpp b/src/lib/asn1/oid_maps.cpp index e9c671d16..7ba7dda70 100644 --- a/src/lib/asn1/oid_maps.cpp +++ b/src/lib/asn1/oid_maps.cpp @@ -1,7 +1,7 @@ /* * OID maps * -* This file was automatically generated by ./src/scripts/oids.py on 2018-05-02 +* This file was automatically generated by ./src/scripts/oids.py on 2018-05-16 * * All manual edits to this file will be lost. Edit the script * then regenerate this source file. @@ -115,6 +115,7 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map() { "1.3.36.3.3.2.8.1.1.9", "brainpool320r1" }, { "1.3.6.1.4.1.11591.12.2", "Tiger(24,3)" }, { "1.3.6.1.4.1.11591.15.1", "OpenPGP.Ed25519" }, + { "1.3.6.1.4.1.11591.4.11", "Scrypt" }, { "1.3.6.1.4.1.25258.1.3", "McEliece" }, { "1.3.6.1.4.1.25258.1.5", "XMSS" }, { "1.3.6.1.4.1.25258.1.6.1", "GOST-34.10/EMSA1(SHA-256)" }, @@ -351,6 +352,7 @@ std::unordered_map<std::string, OID> OIDS::load_str2oid_map() { "SM2_Kex", OID({1,2,156,10197,1,301,2}) }, { "SM2_Sig", OID({1,2,156,10197,1,301,1}) }, { "SM3", OID({1,2,156,10197,1,401}) }, + { "Scrypt", OID({1,3,6,1,4,1,11591,4,11}) }, { "Serpent/CBC", OID({1,3,6,1,4,1,25258,3,1}) }, { "Serpent/GCM", OID({1,3,6,1,4,1,25258,3,101}) }, { "Serpent/OCB", OID({1,3,6,1,4,1,25258,3,2,4}) }, |