diff options
| -rw-r--r-- | src/build-data/oids.txt | 4 | ||||
| -rw-r--r-- | src/lib/asn1/oids.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/build-data/oids.txt b/src/build-data/oids.txt index 57df53462..41e599e29 100644 --- a/src/build-data/oids.txt +++ b/src/build-data/oids.txt @@ -8,9 +8,9 @@ 1.2.840.10046.2.1 = DH 1.3.6.1.4.1.3029.1.2.1 = ElGamal 1.3.6.1.4.1.25258.1.3 = McEliece -1.3.6.1.4.1.25258.1.4 = Curve25519 +1.3.101.110 = Curve25519 1.3.6.1.4.1.25258.1.5 = XMSS -1.3.6.1.4.1.25258.1.6 = Ed25519 +1.3.101.112 = Ed25519 # X9.62 ecPublicKey, valid for ECDSA and ECDH (RFC 3279 sec 2.3.5) 1.2.840.10045.2.1 = ECDSA diff --git a/src/lib/asn1/oids.cpp b/src/lib/asn1/oids.cpp index 26e98ed6f..794f0f6f0 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-06-07 +* This file was automatically generated by ./src/scripts/oids.py on 2017-06-12 * * All manual edits to this file will be lost. Edit the script * then regenerate this source file. @@ -73,6 +73,8 @@ std::string lookup(const OID& oid) if(oid_str == "1.2.840.113549.2.9") return "HMAC(SHA-256)"; if(oid_str == "1.2.840.113549.3.2") return "RC2/CBC"; if(oid_str == "1.2.840.113549.3.7") return "TripleDES/CBC"; + if(oid_str == "1.3.101.110") return "Curve25519"; + if(oid_str == "1.3.101.112") return "Ed25519"; if(oid_str == "1.3.132.0.10") return "secp256k1"; if(oid_str == "1.3.132.0.30") return "secp160r2"; if(oid_str == "1.3.132.0.31") return "secp192k1"; @@ -102,9 +104,7 @@ std::string lookup(const OID& oid) if(oid_str == "1.3.36.3.3.2.8.1.1.9") return "brainpool320r1"; if(oid_str == "1.3.6.1.4.1.11591.12.2") return "Tiger(24,3)"; 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"; @@ -226,7 +226,7 @@ OID lookup(const std::string& name) if(name == "AES-256/OCB") return OID("1.3.6.1.4.1.25258.3.2.3"); if(name == "CAST-128/CBC") return OID("1.2.840.113533.7.66.10"); if(name == "Compression.Zlib") return OID("1.2.840.113549.1.9.16.3.8"); - if(name == "Curve25519") return OID("1.3.6.1.4.1.25258.1.4"); + if(name == "Curve25519") return OID("1.3.101.110"); if(name == "DES/CBC") return OID("1.3.14.3.2.7"); if(name == "DH") return OID("1.2.840.10046.2.1"); if(name == "DSA") return OID("1.2.840.10040.4.1"); @@ -261,7 +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 == "Ed25519") return OID("1.3.101.112"); 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"); |