Don't add semicolon to CRYPTOPP_CONSTANT abd DOCUMENTED_TYPEDEF (GH #889)

This issue is a recurring issue. Let's try fixing it in the #define this time.

1 files changed, 37 insertions, 37 deletions

diff --git a/blake2.h b/blake2.h
index 5e0542f2..79965fdd 100644
--- a/blake2.h
+++ b/blake2.h
@@ -27,14 +27,14 @@ NAMESPACE_BEGIN(CryptoPP)
 struct BLAKE2s_Info : public VariableKeyLength<32,0,32,1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE>

 {

     typedef VariableKeyLength<32,0,32,1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE> KeyBase;

-    CRYPTOPP_CONSTANT(MIN_KEYLENGTH = KeyBase::MIN_KEYLENGTH)

-    CRYPTOPP_CONSTANT(MAX_KEYLENGTH = KeyBase::MAX_KEYLENGTH)

-    CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = KeyBase::DEFAULT_KEYLENGTH)

+    CRYPTOPP_CONSTANT(MIN_KEYLENGTH = KeyBase::MIN_KEYLENGTH)
;

+    CRYPTOPP_CONSTANT(MAX_KEYLENGTH = KeyBase::MAX_KEYLENGTH)
;

+    CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = KeyBase::DEFAULT_KEYLENGTH)
;

 

-    CRYPTOPP_CONSTANT(BLOCKSIZE = 64)

-    CRYPTOPP_CONSTANT(DIGESTSIZE = 32)

-    CRYPTOPP_CONSTANT(SALTSIZE = 8)

-    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = 8)

+    CRYPTOPP_CONSTANT(BLOCKSIZE = 64)
;

+    CRYPTOPP_CONSTANT(DIGESTSIZE = 32)
;

+    CRYPTOPP_CONSTANT(SALTSIZE = 8)
;

+    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = 8)
;

 

     CRYPTOPP_STATIC_CONSTEXPR const char* StaticAlgorithmName() {return "BLAKE2s";}

 };

@@ -44,14 +44,14 @@ struct BLAKE2s_Info : public VariableKeyLength<32,0,32,1,SimpleKeyingInterface::
 struct BLAKE2b_Info : public VariableKeyLength<64,0,64,1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE>

 {

     typedef VariableKeyLength<64,0,64,1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE> KeyBase;

-    CRYPTOPP_CONSTANT(MIN_KEYLENGTH = KeyBase::MIN_KEYLENGTH)

-    CRYPTOPP_CONSTANT(MAX_KEYLENGTH = KeyBase::MAX_KEYLENGTH)

-    CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = KeyBase::DEFAULT_KEYLENGTH)

+    CRYPTOPP_CONSTANT(MIN_KEYLENGTH = KeyBase::MIN_KEYLENGTH)
;

+    CRYPTOPP_CONSTANT(MAX_KEYLENGTH = KeyBase::MAX_KEYLENGTH)
;

+    CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = KeyBase::DEFAULT_KEYLENGTH)
;

 

-    CRYPTOPP_CONSTANT(BLOCKSIZE = 128)

-    CRYPTOPP_CONSTANT(DIGESTSIZE = 64)

-    CRYPTOPP_CONSTANT(SALTSIZE = 16)

-    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = 16)

+    CRYPTOPP_CONSTANT(BLOCKSIZE = 128)
;

+    CRYPTOPP_CONSTANT(DIGESTSIZE = 64)
;

+    CRYPTOPP_CONSTANT(SALTSIZE = 16)
;

+    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = 16)
;

 

     CRYPTOPP_STATIC_CONSTEXPR const char* StaticAlgorithmName() {return "BLAKE2b";}

 };

@@ -59,9 +59,9 @@ struct BLAKE2b_Info : public VariableKeyLength<64,0,64,1,SimpleKeyingInterface::
 /// \brief BLAKE2s parameter block

 struct CRYPTOPP_NO_VTABLE BLAKE2s_ParameterBlock

 {

-    CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2s_Info::SALTSIZE)

-    CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2s_Info::DIGESTSIZE)

-    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2s_Info::PERSONALIZATIONSIZE)

+    CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2s_Info::SALTSIZE)
;

+    CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2s_Info::DIGESTSIZE)
;

+    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2s_Info::PERSONALIZATIONSIZE)
;

 

     BLAKE2s_ParameterBlock()

     {

@@ -110,9 +110,9 @@ struct CRYPTOPP_NO_VTABLE BLAKE2s_ParameterBlock
 /// \brief BLAKE2b parameter block

 struct CRYPTOPP_NO_VTABLE BLAKE2b_ParameterBlock

 {

-    CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2b_Info::SALTSIZE)

-    CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2b_Info::DIGESTSIZE)

-    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2b_Info::PERSONALIZATIONSIZE)

+    CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2b_Info::SALTSIZE)
;

+    CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2b_Info::DIGESTSIZE)
;

+    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2b_Info::PERSONALIZATIONSIZE)
;

 

     BLAKE2b_ParameterBlock()

     {

@@ -185,7 +185,7 @@ struct CRYPTOPP_NO_VTABLE BLAKE2s_State
     }

 

     // SSE4, Power7 and NEON depend upon t[] and f[] being side-by-side

-    CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2s_Info::BLOCKSIZE)

+    CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2s_Info::BLOCKSIZE)
;

     FixedSizeAlignedSecBlock<word32, 8+2+2, true> m_hft;

     FixedSizeAlignedSecBlock<byte, BLOCKSIZE, true> m_buf;

     size_t m_len;

@@ -218,7 +218,7 @@ struct CRYPTOPP_NO_VTABLE BLAKE2b_State
     }

 

     // SSE4, Power8 and NEON depend upon t[] and f[] being side-by-side

-    CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2b_Info::BLOCKSIZE)

+    CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2b_Info::BLOCKSIZE)
;

     FixedSizeAlignedSecBlock<word64, 8+2+2, true> m_hft;

     FixedSizeAlignedSecBlock<byte, BLOCKSIZE, true> m_buf;

     size_t m_len;

@@ -237,14 +237,14 @@ struct CRYPTOPP_NO_VTABLE BLAKE2b_State
 class BLAKE2s : public SimpleKeyingInterfaceImpl<MessageAuthenticationCode, BLAKE2s_Info>

 {

 public:

-    CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = BLAKE2s_Info::DEFAULT_KEYLENGTH)

-    CRYPTOPP_CONSTANT(MIN_KEYLENGTH = BLAKE2s_Info::MIN_KEYLENGTH)

-    CRYPTOPP_CONSTANT(MAX_KEYLENGTH = BLAKE2s_Info::MAX_KEYLENGTH)

+    CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = BLAKE2s_Info::DEFAULT_KEYLENGTH)
;

+    CRYPTOPP_CONSTANT(MIN_KEYLENGTH = BLAKE2s_Info::MIN_KEYLENGTH)
;

+    CRYPTOPP_CONSTANT(MAX_KEYLENGTH = BLAKE2s_Info::MAX_KEYLENGTH)
;

 

-    CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2s_Info::DIGESTSIZE)

-    CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2s_Info::BLOCKSIZE)

-    CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2s_Info::SALTSIZE)

-    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2s_Info::PERSONALIZATIONSIZE)

+    CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2s_Info::DIGESTSIZE)
;

+    CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2s_Info::BLOCKSIZE)
;

+    CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2s_Info::SALTSIZE)
;

+    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2s_Info::PERSONALIZATIONSIZE)
;

 

     typedef BLAKE2s_State State;

     typedef BLAKE2s_ParameterBlock ParameterBlock;

@@ -344,14 +344,14 @@ private:
 class BLAKE2b : public SimpleKeyingInterfaceImpl<MessageAuthenticationCode, BLAKE2b_Info>

 {

 public:

-    CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = BLAKE2b_Info::DEFAULT_KEYLENGTH)

-    CRYPTOPP_CONSTANT(MIN_KEYLENGTH = BLAKE2b_Info::MIN_KEYLENGTH)

-    CRYPTOPP_CONSTANT(MAX_KEYLENGTH = BLAKE2b_Info::MAX_KEYLENGTH)

-

-    CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2b_Info::DIGESTSIZE)

-    CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2b_Info::BLOCKSIZE)

-    CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2b_Info::SALTSIZE)

-    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2b_Info::PERSONALIZATIONSIZE)

+    CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = BLAKE2b_Info::DEFAULT_KEYLENGTH)
;

+    CRYPTOPP_CONSTANT(MIN_KEYLENGTH = BLAKE2b_Info::MIN_KEYLENGTH)
;

+    CRYPTOPP_CONSTANT(MAX_KEYLENGTH = BLAKE2b_Info::MAX_KEYLENGTH)
;

+

+    CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2b_Info::DIGESTSIZE)
;

+    CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2b_Info::BLOCKSIZE)
;

+    CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2b_Info::SALTSIZE)
;

+    CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2b_Info::PERSONALIZATIONSIZE)
;

 

     typedef BLAKE2b_State State;

     typedef BLAKE2b_ParameterBlock ParameterBlock;