diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/oids.txt | 2 | ||||
| -rw-r--r-- | src/lib/asn1/oid_maps.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/build-data/oids.txt b/src/build-data/oids.txt index 45fb80d58..55acc0e9b 100644 --- a/src/build-data/oids.txt +++ b/src/build-data/oids.txt @@ -48,6 +48,8 @@ 1.2.410.200004.1.4 = SEED/CBC 1.2.156.10197.1.104.2 = SM4/CBC +1.2.840.113549.1.9.16.3.18 = ChaCha20Poly1305 + 2.16.840.1.101.3.4.1.6 = AES-128/GCM 2.16.840.1.101.3.4.1.26 = AES-192/GCM 2.16.840.1.101.3.4.1.46 = AES-256/GCM diff --git a/src/lib/asn1/oid_maps.cpp b/src/lib/asn1/oid_maps.cpp index 6cc105b47..138661a80 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-22 +* This file was automatically generated by ./src/scripts/oids.py on 2018-07-01 * * All manual edits to this file will be lost. Edit the script * then regenerate this source file. @@ -76,6 +76,7 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map() { "1.2.840.113549.1.5.13", "PBE-PKCS5v20" }, { "1.2.840.113549.1.9.1", "PKCS9.EmailAddress" }, { "1.2.840.113549.1.9.14", "PKCS9.ExtensionRequest" }, + { "1.2.840.113549.1.9.16.3.18", "ChaCha20Poly1305" }, { "1.2.840.113549.1.9.16.3.6", "KeyWrap.TripleDES" }, { "1.2.840.113549.1.9.16.3.7", "KeyWrap.RC2" }, { "1.2.840.113549.1.9.16.3.8", "Compression.Zlib" }, @@ -251,6 +252,7 @@ std::unordered_map<std::string, OID> OIDS::load_str2oid_map() { "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}) }, + { "ChaCha20Poly1305", OID({1,2,840,113549,1,9,16,3,18}) }, { "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}) }, |