aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/asn1
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-07-01 16:33:14 -0400
committerJack Lloyd <[email protected]>2018-07-01 16:33:14 -0400
commit1c9e85ccdc2a59e326df0c6a5a01b2fb44ebd28c (patch)
treef6e5d7cb3a1556a871fa5a94e44270f279ebad4e /src/lib/asn1
parentc8af0dc207e798ef3d918a94601fc73ffae963c5 (diff)
Add OID for ChaCha20Poly1305
From RFC 8103
Diffstat (limited to 'src/lib/asn1')
-rw-r--r--src/lib/asn1/oid_maps.cpp4
1 files changed, 3 insertions, 1 deletions
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}) },