From dffc54c085985e86b1ae926b2711d9dc709df842 Mon Sep 17 00:00:00 2001
From: Rene Meusel <rene.meusel@rohde-schwarz.com>
Date: Thu, 2 Nov 2023 07:40:25 +0100
Subject: [PATCH] update OIDs to not clash with #3716

---
 doc/dev_ref/oids.rst      |  8 +++----
 src/build-data/oids.txt   | 24 +++++++++----------
 src/lib/asn1/oid_maps.cpp | 50 +++++++++++++++++++--------------------
 3 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/doc/dev_ref/oids.rst b/doc/dev_ref/oids.rst
index bbc48a3cb4..47683e9fc6 100644
--- a/doc/dev_ref/oids.rst
+++ b/doc/dev_ref/oids.rst
@@ -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  }
diff --git a/src/build-data/oids.txt b/src/build-data/oids.txt
index 1c1c9f8edd..b3146f4d5f 100644
--- a/src/build-data/oids.txt
+++ b/src/build-data/oids.txt
@@ -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
diff --git a/src/lib/asn1/oid_maps.cpp b/src/lib/asn1/oid_maps.cpp
index 847b9c33e1..d879c2fe6f 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/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.
@@ -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"},
@@ -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})},
@@ -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})},