Minimum Botan version 3.2.0 for PQC build; fix issue rnpgp#2247--

TJ-91 · Sep 27, 2024 · 945700e · 945700e
1 parent 7724682
commit 945700e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -31,12 +31,17 @@ find_package(ZLIB REQUIRED)
 
 # required packages
 find_package(JSON-C 0.11 REQUIRED)
-if (CRYPTO_BACKEND_BOTAN3)
-  find_package(Botan 3.0.0 REQUIRED)
-elseif (CRYPTO_BACKEND_BOTAN)
-  find_package(Botan 2.14.0 REQUIRED)
-  if(BOTAN_VERSION VERSION_GREATER_EQUAL 3.0.0)
-    set(CRYPTO_BACKEND_BOTAN3 1)
+if(ENABLE_PQC)
+  find_package(Botan 3.2.0 REQUIRED)
+  set(CRYPTO_BACKEND_BOTAN3 1)
+else()
+  if (CRYPTO_BACKEND_BOTAN3)
+    find_package(Botan 3.0.0 REQUIRED)
+  elseif (CRYPTO_BACKEND_BOTAN)
+    find_package(Botan 2.14.0 REQUIRED)
+    if(BOTAN_VERSION VERSION_GREATER_EQUAL 3.0.0)
+      set(CRYPTO_BACKEND_BOTAN3 1)
+    endif()
   endif()
 endif()
 if (CRYPTO_BACKEND_OPENSSL)

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

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
@@ -66,12 +66,17 @@ else()
 endif()
 
 find_package(JSON-C 0.11 REQUIRED)
-if (CRYPTO_BACKEND_BOTAN3)
-  find_package(Botan 3.0.0 REQUIRED)
-elseif (CRYPTO_BACKEND_BOTAN)
-  find_package(Botan 2.14.0 REQUIRED)
-  if(BOTAN_VERSION VERSION_GREATER_EQUAL 3.0.0)
-    set(CRYPTO_BACKEND_BOTAN3 1)
+if(ENABLE_PQC)
+  find_package(Botan 3.2.0 REQUIRED)
+  set(CRYPTO_BACKEND_BOTAN3 1)
+else()
+  if (CRYPTO_BACKEND_BOTAN3)
+    find_package(Botan 3.2.0 REQUIRED)
+  elseif (CRYPTO_BACKEND_BOTAN)
+    find_package(Botan 2.14.0 REQUIRED)
+    if(BOTAN_VERSION VERSION_GREATER_EQUAL 3.0.0)
+      set(CRYPTO_BACKEND_BOTAN3 1)
+    endif()
   endif()
 endif()
 if (CRYPTO_BACKEND_LOWERCASE STREQUAL "openssl")