diff options
| author | Jack Lloyd <[email protected]> | 2019-08-03 19:21:33 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-08-03 19:32:18 -0400 |
| commit | 4719685cbf74904e0e4cc205cf09830cff1b04dc (patch) | |
| tree | bc53f46336a93d2940c63f0c4fbf93f1cad9de21 /src/lib/asn1 | |
| parent | da7e97bfcfcd476b28a2ac8cf95d32feecd7dae9 (diff) | |
Update GOST to use 2012 OIDs/params
Diffstat (limited to 'src/lib/asn1')
| -rw-r--r-- | src/lib/asn1/oid_maps.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/asn1/oid_maps.cpp b/src/lib/asn1/oid_maps.cpp index 0072f989b..47d418271 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 2019-08-01 +* This file was automatically generated by ./src/scripts/oids.py on 2019-08-03 * * All manual edits to this file will be lost. Edit the script * then regenerate this source file. @@ -51,7 +51,8 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map() { "1.2.643.7.1.1.1.2", "GOST-34.10-2012-512" }, { "1.2.643.7.1.1.2.2", "Streebog-256" }, { "1.2.643.7.1.1.2.3", "Streebog-512" }, - { "1.2.643.7.1.1.3.2", "GOST-34.10/EMSA1(Streebog-256)" }, + { "1.2.643.7.1.1.3.2", "GOST-34.10-2012-256/EMSA1(Streebog-256)" }, + { "1.2.643.7.1.1.3.3", "GOST-34.10-2012-512/EMSA1(Streebog-512)" }, { "1.2.643.7.1.2.1.1.1", "gost_256A" }, { "1.2.643.7.1.2.1.1.2", "gost_256B" }, { "1.2.643.7.1.2.1.2.1", "gost_512A" }, @@ -139,7 +140,7 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map() { "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-draft6" }, - { "1.3.6.1.4.1.25258.1.6.1", "GOST-34.10/EMSA1(SHA-256)" }, + { "1.3.6.1.4.1.25258.1.6.1", "GOST-34.10-2012-256/EMSA1(SHA-256)" }, { "1.3.6.1.4.1.25258.1.8", "XMSS" }, { "1.3.6.1.4.1.25258.3.1", "Serpent/CBC" }, { "1.3.6.1.4.1.25258.3.101", "Serpent/GCM" }, @@ -332,10 +333,11 @@ std::unordered_map<std::string, OID> OIDS::load_str2oid_map() { "ElGamal", OID({1,3,6,1,4,1,3029,1,2,1}) }, { "GOST-34.10", OID({1,2,643,2,2,19}) }, { "GOST-34.10-2012-256", OID({1,2,643,7,1,1,1,1}) }, + { "GOST-34.10-2012-256/EMSA1(SHA-256)", OID({1,3,6,1,4,1,25258,1,6,1}) }, + { "GOST-34.10-2012-256/EMSA1(Streebog-256)", OID({1,2,643,7,1,1,3,2}) }, { "GOST-34.10-2012-512", OID({1,2,643,7,1,1,1,2}) }, + { "GOST-34.10-2012-512/EMSA1(Streebog-512)", OID({1,2,643,7,1,1,3,3}) }, { "GOST-34.10/EMSA1(GOST-R-34.11-94)", OID({1,2,643,2,2,3}) }, - { "GOST-34.10/EMSA1(SHA-256)", OID({1,3,6,1,4,1,25258,1,6,1}) }, - { "GOST-34.10/EMSA1(Streebog-256)", OID({1,2,643,7,1,1,3,2}) }, { "GOST.INN", OID({1,2,643,3,131,1,1}) }, { "GOST.IssuerSigningTool", OID({1,2,643,100,112}) }, { "GOST.OGRN", OID({1,2,643,100,1}) }, |