aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/asn1/oids.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/asn1/oids.cpp')
-rw-r--r--src/lib/asn1/oids.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/asn1/oids.cpp b/src/lib/asn1/oids.cpp
index 17bfb9f1c..26e98ed6f 100644
--- a/src/lib/asn1/oids.cpp
+++ b/src/lib/asn1/oids.cpp
@@ -1,7 +1,7 @@
/*
* OID maps
*
-* This file was automatically generated by ./src/scripts/oids.py on 2017-05-19
+* This file was automatically generated by ./src/scripts/oids.py on 2017-06-07
*
* All manual edits to this file will be lost. Edit the script
* then regenerate this source file.
@@ -104,6 +104,7 @@ std::string lookup(const OID& oid)
if(oid_str == "1.3.6.1.4.1.25258.1.3") return "McEliece";
if(oid_str == "1.3.6.1.4.1.25258.1.4") return "Curve25519";
if(oid_str == "1.3.6.1.4.1.25258.1.5") return "XMSS";
+ if(oid_str == "1.3.6.1.4.1.25258.1.6") return "Ed25519";
if(oid_str == "1.3.6.1.4.1.25258.1.6.1") return "GOST-34.10/EMSA1(SHA-256)";
if(oid_str == "1.3.6.1.4.1.25258.3.1") return "Serpent/CBC";
if(oid_str == "1.3.6.1.4.1.25258.3.101") return "Serpent/GCM";
@@ -260,6 +261,7 @@ OID lookup(const std::string& name)
if(name == "ECKCDSA/EMSA1(SHA-1)") return OID("1.2.410.200004.1.100.4.3");
if(name == "ECKCDSA/EMSA1(SHA-224)") return OID("1.2.410.200004.1.100.4.4");
if(name == "ECKCDSA/EMSA1(SHA-256)") return OID("1.2.410.200004.1.100.4.5");
+ if(name == "Ed25519") return OID("1.3.6.1.4.1.25258.1.6");
if(name == "ElGamal") return OID("1.3.6.1.4.1.3029.1.2.1");
if(name == "GOST-34.10") return OID("1.2.643.2.2.19");
if(name == "GOST-34.10/EMSA1(GOST-R-34.11-94)") return OID("1.2.643.2.2.3");