Skip to content

Commit

Permalink
update OIDs to not clash with randombit#3716
Browse files Browse the repository at this point in the history
  • Loading branch information
@reneme
reneme committed Nov 2, 2023
1 parent 4aaec3c commit dffc54c
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 41 deletions.
8 changes: 4 additions & 4 deletions doc/dev_ref/oids.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ Values currently assigned are::
-- { publicKey 5 } previously used for XMSS draft 6
gost-3410-with-sha256 OBJECT IDENTIFIER ::= { publicKey 6 1 }

frodokem-shake OBJECT IDENTIFIER ::= { publicKey 13 }
efrodokem-shake OBJECT IDENTIFIER ::= { publicKey 15 }
frodokem-aes OBJECT IDENTIFIER ::= { publicKey 14 }
efrodokem-aes OBJECT IDENTIFIER ::= { publicKey 16 }
frodokem-shake OBJECT IDENTIFIER ::= { publicKey 14 }
efrodokem-shake OBJECT IDENTIFIER ::= { publicKey 16 }
frodokem-aes OBJECT IDENTIFIER ::= { publicKey 15 }
efrodokem-aes OBJECT IDENTIFIER ::= { publicKey 17 }

frodokem-640-shake OBJECT_IDENTIFIER : { frodokem-shake 1 }
frodokem-976-shake OBJECT_IDENTIFIER : { frodokem-shake 2 }
Expand Down
24 changes: 12 additions & 12 deletions src/build-data/oids.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
1.3.101.112 = Ed25519

# FrodoKEM OIDs are currently in Botan's private arc
1.3.6.1.4.1.25258.1.13.1 = FrodoKEM-640-SHAKE
1.3.6.1.4.1.25258.1.13.2 = FrodoKEM-976-SHAKE
1.3.6.1.4.1.25258.1.13.3 = FrodoKEM-1344-SHAKE
1.3.6.1.4.1.25258.1.14.1 = FrodoKEM-640-AES
1.3.6.1.4.1.25258.1.14.2 = FrodoKEM-976-AES
1.3.6.1.4.1.25258.1.14.3 = FrodoKEM-1344-AES
1.3.6.1.4.1.25258.1.15.1 = eFrodoKEM-640-SHAKE
1.3.6.1.4.1.25258.1.15.2 = eFrodoKEM-976-SHAKE
1.3.6.1.4.1.25258.1.15.3 = eFrodoKEM-1344-SHAKE
1.3.6.1.4.1.25258.1.16.1 = eFrodoKEM-640-AES
1.3.6.1.4.1.25258.1.16.2 = eFrodoKEM-976-AES
1.3.6.1.4.1.25258.1.16.3 = eFrodoKEM-1344-AES
1.3.6.1.4.1.25258.1.14.1 = FrodoKEM-640-SHAKE
1.3.6.1.4.1.25258.1.14.2 = FrodoKEM-976-SHAKE
1.3.6.1.4.1.25258.1.14.3 = FrodoKEM-1344-SHAKE
1.3.6.1.4.1.25258.1.15.1 = FrodoKEM-640-AES
1.3.6.1.4.1.25258.1.15.2 = FrodoKEM-976-AES
1.3.6.1.4.1.25258.1.15.3 = FrodoKEM-1344-AES
1.3.6.1.4.1.25258.1.16.1 = eFrodoKEM-640-SHAKE
1.3.6.1.4.1.25258.1.16.2 = eFrodoKEM-976-SHAKE
1.3.6.1.4.1.25258.1.16.3 = eFrodoKEM-1344-SHAKE
1.3.6.1.4.1.25258.1.17.1 = eFrodoKEM-640-AES
1.3.6.1.4.1.25258.1.17.2 = eFrodoKEM-976-AES
1.3.6.1.4.1.25258.1.17.3 = eFrodoKEM-1344-AES

# Kyber OIDs are currently in Botan's private arc
1.3.6.1.4.1.25258.1.7.1 = Kyber-512-r3
Expand Down
50 changes: 25 additions & 25 deletions src/lib/asn1/oid_maps.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* OID maps
*
* This file was automatically generated by ./src/scripts/dev_tools/gen_oids.py on 2023-09-29
* This file was automatically generated by ./src/scripts/dev_tools/gen_oids.py on 2023-11-02
*
* All manual edits to this file will be lost. Edit the script
* then regenerate this source file.
Expand Down Expand Up @@ -162,18 +162,18 @@ std::unordered_map<std::string, std::string> OID_Map::load_oid2str_map() {
{"1.3.6.1.4.1.25258.1.12.3.4", "SphincsPlus-haraka-192f-r3.1"},
{"1.3.6.1.4.1.25258.1.12.3.5", "SphincsPlus-haraka-256s-r3.1"},
{"1.3.6.1.4.1.25258.1.12.3.6", "SphincsPlus-haraka-256f-r3.1"},
{"1.3.6.1.4.1.25258.1.13.1", "FrodoKEM-640-SHAKE"},
{"1.3.6.1.4.1.25258.1.13.2", "FrodoKEM-976-SHAKE"},
{"1.3.6.1.4.1.25258.1.13.3", "FrodoKEM-1344-SHAKE"},
{"1.3.6.1.4.1.25258.1.14.1", "FrodoKEM-640-AES"},
{"1.3.6.1.4.1.25258.1.14.2", "FrodoKEM-976-AES"},
{"1.3.6.1.4.1.25258.1.14.3", "FrodoKEM-1344-AES"},
{"1.3.6.1.4.1.25258.1.15.1", "eFrodoKEM-640-SHAKE"},
{"1.3.6.1.4.1.25258.1.15.2", "eFrodoKEM-976-SHAKE"},
{"1.3.6.1.4.1.25258.1.15.3", "eFrodoKEM-1344-SHAKE"},
{"1.3.6.1.4.1.25258.1.16.1", "eFrodoKEM-640-AES"},
{"1.3.6.1.4.1.25258.1.16.2", "eFrodoKEM-976-AES"},
{"1.3.6.1.4.1.25258.1.16.3", "eFrodoKEM-1344-AES"},
{"1.3.6.1.4.1.25258.1.14.1", "FrodoKEM-640-SHAKE"},
{"1.3.6.1.4.1.25258.1.14.2", "FrodoKEM-976-SHAKE"},
{"1.3.6.1.4.1.25258.1.14.3", "FrodoKEM-1344-SHAKE"},
{"1.3.6.1.4.1.25258.1.15.1", "FrodoKEM-640-AES"},
{"1.3.6.1.4.1.25258.1.15.2", "FrodoKEM-976-AES"},
{"1.3.6.1.4.1.25258.1.15.3", "FrodoKEM-1344-AES"},
{"1.3.6.1.4.1.25258.1.16.1", "eFrodoKEM-640-SHAKE"},
{"1.3.6.1.4.1.25258.1.16.2", "eFrodoKEM-976-SHAKE"},
{"1.3.6.1.4.1.25258.1.16.3", "eFrodoKEM-1344-SHAKE"},
{"1.3.6.1.4.1.25258.1.17.1", "eFrodoKEM-640-AES"},
{"1.3.6.1.4.1.25258.1.17.2", "eFrodoKEM-976-AES"},
{"1.3.6.1.4.1.25258.1.17.3", "eFrodoKEM-1344-AES"},
{"1.3.6.1.4.1.25258.1.3", "McEliece"},
{"1.3.6.1.4.1.25258.1.5", "XMSS-draft6"},
{"1.3.6.1.4.1.25258.1.6.1", "GOST-34.10-2012-256/SHA-256"},
Expand Down Expand Up @@ -379,12 +379,12 @@ std::unordered_map<std::string, OID> OID_Map::load_str2oid_map() {
{"ECKCDSA/SHA-256", OID({1, 2, 410, 200004, 1, 100, 4, 5})},
{"Ed25519", OID({1, 3, 101, 112})},
{"ElGamal", OID({1, 3, 6, 1, 4, 1, 3029, 1, 2, 1})},
{"FrodoKEM-1344-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 14, 3})},
{"FrodoKEM-1344-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 13, 3})},
{"FrodoKEM-640-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 14, 1})},
{"FrodoKEM-640-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 13, 1})},
{"FrodoKEM-976-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 14, 2})},
{"FrodoKEM-976-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 13, 2})},
{"FrodoKEM-1344-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 15, 3})},
{"FrodoKEM-1344-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 14, 3})},
{"FrodoKEM-640-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 15, 1})},
{"FrodoKEM-640-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 14, 1})},
{"FrodoKEM-976-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 15, 2})},
{"FrodoKEM-976-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 14, 2})},
{"GOST-34.10", OID({1, 2, 643, 2, 2, 19})},
{"GOST-34.10-2012-256", OID({1, 2, 643, 7, 1, 1, 1, 1})},
{"GOST-34.10-2012-256/SHA-256", OID({1, 3, 6, 1, 4, 1, 25258, 1, 6, 1})},
Expand Down Expand Up @@ -558,12 +558,12 @@ std::unordered_map<std::string, OID> OID_Map::load_str2oid_map() {
{"brainpool320r1", OID({1, 3, 36, 3, 3, 2, 8, 1, 1, 9})},
{"brainpool384r1", OID({1, 3, 36, 3, 3, 2, 8, 1, 1, 11})},
{"brainpool512r1", OID({1, 3, 36, 3, 3, 2, 8, 1, 1, 13})},
{"eFrodoKEM-1344-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 16, 3})},
{"eFrodoKEM-1344-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 15, 3})},
{"eFrodoKEM-640-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 16, 1})},
{"eFrodoKEM-640-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 15, 1})},
{"eFrodoKEM-976-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 16, 2})},
{"eFrodoKEM-976-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 15, 2})},
{"eFrodoKEM-1344-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 17, 3})},
{"eFrodoKEM-1344-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 16, 3})},
{"eFrodoKEM-640-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 17, 1})},
{"eFrodoKEM-640-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 16, 1})},
{"eFrodoKEM-976-AES", OID({1, 3, 6, 1, 4, 1, 25258, 1, 17, 2})},
{"eFrodoKEM-976-SHAKE", OID({1, 3, 6, 1, 4, 1, 25258, 1, 16, 2})},
{"frp256v1", OID({1, 2, 250, 1, 223, 101, 256, 1})},
{"gost_256A", OID({1, 2, 643, 7, 1, 2, 1, 1, 1})},
{"gost_256B", OID({1, 2, 643, 7, 1, 2, 1, 1, 2})},
Expand Down

0 comments on commit dffc54c

Please sign in to comment.