diff options
| author | Jack Lloyd <[email protected]> | 2018-05-02 10:29:57 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-05-02 10:29:57 -0400 |
| commit | 807286ac36ebe8bb92792933c9722ae53db014ab (patch) | |
| tree | 1b8c875a196bee3df1a7c5cd865b3e919b791628 | |
| parent | f85907c5f4b29cc3370c053bbb22e09c86f376cd (diff) | |
| parent | da499e6490b8b0f5a9b53943049c05a33d10cdf8 (diff) | |
Merge GH #1560 Add OpenPGP specific (Ed|X)25519 OIDs
| -rw-r--r-- | src/build-data/oids.txt | 4 | ||||
| -rw-r--r-- | src/lib/asn1/oid_maps.cpp | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/build-data/oids.txt b/src/build-data/oids.txt index 0613bf822..0cf3d8d5d 100644 --- a/src/build-data/oids.txt +++ b/src/build-data/oids.txt @@ -32,6 +32,10 @@ 1.2.643.2.2.19 = GOST-34.10 +# OpenPGP (RFC4880bis) +1.3.6.1.4.1.11591.15.1 = OpenPGP.Ed25519 +1.3.6.1.4.1.3029.1.5.1 = OpenPGP.Curve25519 + [cipher] # Cipher modes 1.3.14.3.2.7 = DES/CBC diff --git a/src/lib/asn1/oid_maps.cpp b/src/lib/asn1/oid_maps.cpp index d0d961e27..e9c671d16 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-02-07 +* This file was automatically generated by ./src/scripts/oids.py on 2018-05-02 * * All manual edits to this file will be lost. Edit the script * then regenerate this source file. @@ -114,6 +114,7 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map() { "1.3.36.3.3.2.8.1.1.7", "brainpool256r1" }, { "1.3.36.3.3.2.8.1.1.9", "brainpool320r1" }, { "1.3.6.1.4.1.11591.12.2", "Tiger(24,3)" }, + { "1.3.6.1.4.1.11591.15.1", "OpenPGP.Ed25519" }, { "1.3.6.1.4.1.25258.1.3", "McEliece" }, { "1.3.6.1.4.1.25258.1.5", "XMSS" }, { "1.3.6.1.4.1.25258.1.6.1", "GOST-34.10/EMSA1(SHA-256)" }, @@ -128,6 +129,7 @@ std::unordered_map<std::string, std::string> OIDS::load_oid2str_map() { "1.3.6.1.4.1.25258.3.2.5", "Twofish/OCB" }, { "1.3.6.1.4.1.25258.3.3", "Twofish/CBC" }, { "1.3.6.1.4.1.3029.1.2.1", "ElGamal" }, + { "1.3.6.1.4.1.3029.1.5.1", "OpenPGP.Curve25519" }, { "1.3.6.1.4.1.311.20.2.2", "Microsoft SmartcardLogon" }, { "1.3.6.1.4.1.8301.3.1.2.9.0.38", "secp521r1" }, { "1.3.6.1.5.5.7.1.1", "PKIX.AuthorityInformationAccess" }, @@ -290,6 +292,8 @@ std::unordered_map<std::string, OID> OIDS::load_str2oid_map() { "MGF1", OID({1,2,840,113549,1,1,8}) }, { "McEliece", OID({1,3,6,1,4,1,25258,1,3}) }, { "Microsoft SmartcardLogon", OID({1,3,6,1,4,1,311,20,2,2}) }, + { "OpenPGP.Curve25519", OID({1,3,6,1,4,1,3029,1,5,1}) }, + { "OpenPGP.Ed25519", OID({1,3,6,1,4,1,11591,15,1}) }, { "PBE-PKCS5v20", OID({1,2,840,113549,1,5,13}) }, { "PKCS5.PBKDF2", OID({1,2,840,113549,1,5,12}) }, { "PKCS9.ChallengePassword", OID({1,2,840,113549,1,9,7}) }, |