FIX: CLI speed tool, compiler warning nits

randombit · Aug 24, 2023 · 330d4fc · 330d4fc
1 parent d451bf5
commit 330d4fc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/cli/speed.cpp b/src/cli/speed.cpp
@@ -2015,8 +2015,18 @@ class Speed final : public Command {
 #if defined(BOTAN_HAS_FRODOKEM)
       void bench_frodokem(const std::string& provider, std::chrono::milliseconds msec) {
          std::vector<Botan::FrodoKEMMode> frodo_modes{
-            Botan::FrodoKEMMode::eFrodoKEM640, Botan::FrodoKEMMode::eFrodoKEM976, Botan::FrodoKEMMode::eFrodoKEM1344,
-            // TODO: extend for static variant and AES
+            Botan::FrodoKEMMode::FrodoKEM640_SHAKE,
+            Botan::FrodoKEMMode::FrodoKEM976_SHAKE,
+            Botan::FrodoKEMMode::FrodoKEM1344_SHAKE,
+            Botan::FrodoKEMMode::eFrodoKEM640_SHAKE,
+            Botan::FrodoKEMMode::eFrodoKEM976_SHAKE,
+            Botan::FrodoKEMMode::eFrodoKEM1344_SHAKE,
+            Botan::FrodoKEMMode::FrodoKEM640_AES,
+            Botan::FrodoKEMMode::FrodoKEM976_AES,
+            Botan::FrodoKEMMode::FrodoKEM1344_AES,
+            Botan::FrodoKEMMode::eFrodoKEM640_AES,
+            Botan::FrodoKEMMode::eFrodoKEM976_AES,
+            Botan::FrodoKEMMode::eFrodoKEM1344_AES,
          };
 
          for(auto modet : frodo_modes) {

diff --git a/src/lib/pubkey/frodokem/frodo_matrix.h b/src/lib/pubkey/frodokem/frodo_matrix.h
@@ -92,8 +92,6 @@ class FrodoMatrix {
             m_dim1(std::get<0>(dimensions)), m_dim2(std::get<1>(dimensions)), m_elements(std::move(elements)) {}
 
    private:
-      bool m_transposed = false;
-
       uint16_t m_dim1;
       uint16_t m_dim2;
 

diff --git a/src/lib/pubkey/frodokem/frodokem.cpp b/src/lib/pubkey/frodokem/frodokem.cpp
@@ -315,8 +315,6 @@ std::unique_ptr<PK_Ops::KEM_Encryption> FrodoKEM_PublicKey::create_kem_encryptio
    throw Provider_Not_Found(algo_name(), provider);
 }
 
-FrodoKEMMode FrodoKEM_PublicKey::mode() const {}  //TODO: Do we need this?
-
 //
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 //
@@ -373,6 +371,7 @@ FrodoKEM_PrivateKey::FrodoKEM_PrivateKey(std::span<const uint8_t> sk, FrodoKEMMo
 }
 
 FrodoKEM_PrivateKey::FrodoKEM_PrivateKey(const AlgorithmIdentifier& alg_id, std::span<const uint8_t> key_bits) {
+   BOTAN_UNUSED(alg_id, key_bits);
    throw Not_Implemented("NYI");
 }
 

diff --git a/src/lib/pubkey/frodokem/frodokem.h b/src/lib/pubkey/frodokem/frodokem.h
@@ -65,8 +65,6 @@ class BOTAN_PUBLIC_API(3, 0) FrodoKEM_PublicKey : public virtual Public_Key {
       std::unique_ptr<PK_Ops::KEM_Encryption> create_kem_encryption_op(std::string_view params,
                                                                        std::string_view provider) const override;
 
-      FrodoKEMMode mode() const;
-
    protected:
       FrodoKEM_PublicKey() = default;