Fix AlgorithmName() for 128-bit block SIMON and SPECK

1 files changed, 5 insertions, 2 deletions

diff --git a/speck.h b/speck.h
index 68074957..d4a77035 100644
--- a/speck.h
+++ b/speck.h
@@ -45,6 +45,7 @@ template <class W>
 struct SPECK_Base

 {

     virtual ~SPECK_Base() {}

+    SPECK_Base() : m_kwords(0) {}

 

     typedef SecBlock<W, AllocatorWithCleanup<W, true> > AlignedSecBlock;

     mutable AlignedSecBlock m_wspace;  // workspace

@@ -68,7 +69,8 @@ public:
     {

     public:

         std::string AlgorithmName() const {

-            return StaticAlgorithmName() + "(" + IntToString(m_kwords*sizeof(word32)*8) + ")";

+            return StaticAlgorithmName() + (m_kwords == 0 ? "" :

+                "(" + IntToString(m_kwords*sizeof(word32)*8) + ")");

         }

 

     protected:

@@ -115,7 +117,8 @@ public:
     {

     public:

         std::string AlgorithmName() const {

-            return StaticAlgorithmName() + "(" + IntToString(m_kwords*sizeof(word64)*8) + ")";

+            return StaticAlgorithmName() + (m_kwords == 0 ? "" :

+                "(" + IntToString(m_kwords*sizeof(word64)*8) + ")");

         }

 

     protected: