diff options
| author | Jack Lloyd <[email protected]> | 2018-05-22 23:49:45 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-05-22 23:50:16 -0400 |
| commit | 2b19386ae79141377f0b3026a5705884da397b92 (patch) | |
| tree | 576c146f71a497d11fd380afa549c874f25a0ec1 /src/lib/asn1/oid_maps.cpp | |
| parent | f87b9e4128698951c10e47dca01811a677577ca0 (diff) | |
Add OIDS for Camellia and SM4 in GCM and CBC modes
Making them usable for private key encryption
Diffstat (limited to 'src/lib/asn1/oid_maps.cpp')
| -rw-r--r-- | src/lib/asn1/oid_maps.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/lib/asn1/oid_maps.cpp b/src/lib/asn1/oid_maps.cpp index 7ba7dda70..6cc105b47 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-16 +* This file was automatically generated by ./src/scripts/oids.py on 2018-05-22 * * All manual edits to this file will be lost. Edit the script * then regenerate this source file. @@ -17,7 +17,12 @@ namespace Botan { std::unordered_map<std::string, std::string> OIDS::load_oid2str_map() { return std::unordered_map<std::string,std::string>{ + { "0.3.4401.5.3.1.9.26", "Camellia-192/GCM" }, + { "0.3.4401.5.3.1.9.46", "Camellia-256/GCM" }, + { "0.3.4401.5.3.1.9.6", "Camellia-128/GCM" }, { "1.0.14888.3.0.5", "ECKCDSA" }, + { "1.2.156.10197.1.104.2", "SM4/CBC" }, + { "1.2.156.10197.1.104.8", "SM4/GCM" }, { "1.2.156.10197.1.301", "sm2p256v1" }, { "1.2.156.10197.1.301.1", "SM2_Sig" }, { "1.2.156.10197.1.301.2", "SM2_Kex" }, @@ -25,6 +30,9 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map() { "1.2.156.10197.1.401", "SM3" }, { "1.2.156.10197.1.504", "RSA/EMSA3(SM3)" }, { "1.2.250.1.223.101.256.1", "frp256v1" }, + { "1.2.392.200011.61.1.1.1.2", "Camellia-128/CBC" }, + { "1.2.392.200011.61.1.1.1.3", "Camellia-192/CBC" }, + { "1.2.392.200011.61.1.1.1.4", "Camellia-256/CBC" }, { "1.2.410.200004.1.100.4.3", "ECKCDSA/EMSA1(SHA-1)" }, { "1.2.410.200004.1.100.4.4", "ECKCDSA/EMSA1(SHA-224)" }, { "1.2.410.200004.1.100.4.5", "ECKCDSA/EMSA1(SHA-256)" }, @@ -237,6 +245,12 @@ std::unordered_map<std::string, OID> OIDS::load_str2oid_map() { "AES-256/GCM", OID({2,16,840,1,101,3,4,1,46}) }, { "AES-256/OCB", OID({1,3,6,1,4,1,25258,3,2,3}) }, { "CAST-128/CBC", OID({1,2,840,113533,7,66,10}) }, + { "Camellia-128/CBC", OID({1,2,392,200011,61,1,1,1,2}) }, + { "Camellia-128/GCM", OID({0,3,4401,5,3,1,9,6}) }, + { "Camellia-192/CBC", OID({1,2,392,200011,61,1,1,1,3}) }, + { "Camellia-192/GCM", OID({0,3,4401,5,3,1,9,26}) }, + { "Camellia-256/CBC", OID({1,2,392,200011,61,1,1,1,4}) }, + { "Camellia-256/GCM", OID({0,3,4401,5,3,1,9,46}) }, { "Compression.Zlib", OID({1,2,840,113549,1,9,16,3,8}) }, { "Curve25519", OID({1,3,101,110}) }, { "DES/CBC", OID({1,3,14,3,2,7}) }, @@ -352,6 +366,8 @@ 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}) }, + { "SM4/CBC", OID({1,2,156,10197,1,104,2}) }, + { "SM4/GCM", OID({1,2,156,10197,1,104,8}) }, { "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}) }, |