fix issue rnpgp#2247; use newer kyber _R3 symbols for Botan 3.2.0 upw…

…ards
TJ-91 · Jul 10, 2024 · 010e57d · 010e57d
1 parent 6224061
commit 010e57d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -46,6 +46,11 @@ if (CRYPTO_BACKEND_OPENSSL)
     set(CRYPTO_BACKEND_OPENSSL3 1)
   endif()
 endif()
+if(BOTAN_VERSION VERSION_GREATER_EQUAL 3.2.0)
+  # fix referencing deprecated Kyber enum values for version 3.2.0 and upwards
+  # Note: The following flag is only temporary and will be removed once POC is in a stable state
+  add_definitions(-DENABLE_PQC_NEW_KYBER_ENUM_VALUES)
+endif()
 
 if(CRYPTO_BACKEND_BOTAN3)
   set(CMAKE_CXX_STANDARD 20)

diff --git a/src/lib/crypto/kyber.cpp b/src/lib/crypto/kyber.cpp
@@ -38,11 +38,18 @@ rnp_kyber_param_to_botan_kyber_mode(kyber_parameter_e mode)
     if (mode == kyber_768) {
         result = Botan::KyberMode::ML_KEM_768_ipd;
     }
+#else
+#if defined(ENABLE_PQC_NEW_KYBER_ENUM_VALUES)
+    Botan::KyberMode result = Botan::KyberMode::Kyber1024_R3;
+    if (mode == kyber_768) {
+        result = Botan::KyberMode::Kyber768_R3;
+    }
 #else
     Botan::KyberMode result = Botan::KyberMode::Kyber1024;
     if (mode == kyber_768) {
         result = Botan::KyberMode::Kyber768;
     }
+#endif
 #endif
     return result;
 }