Fix semicolons yet again (GH #889)

So it looks like sed added a '\r' between the closing paren and the semi. Grepping for '^;' failed because the '\r' was considered part of the previous line, so it showed no hits. I finally had to write a C program to properly identify and fix those damn stray semicolons.

1 files changed, 25 insertions, 25 deletions

diff --git a/default.h b/default.h
index 5f4c3905..da9cfb8d 100644
--- a/default.h
+++ b/default.h
@@ -56,11 +56,11 @@ class MACBadErr : public DataDecryptorErr
 template <unsigned int BlockSize, unsigned int KeyLength, unsigned int DigestSize, unsigned int SaltSize, unsigned int Iterations>

 struct DataParametersInfo

 {

-	CRYPTOPP_CONSTANT(BLOCKSIZE  = BlockSize)
;

-	CRYPTOPP_CONSTANT(KEYLENGTH  = KeyLength)
;

-	CRYPTOPP_CONSTANT(SALTLENGTH = SaltSize)
;

-	CRYPTOPP_CONSTANT(DIGESTSIZE = DigestSize)
;

-	CRYPTOPP_CONSTANT(ITERATIONS = Iterations)
;

+	CRYPTOPP_CONSTANT(BLOCKSIZE  = BlockSize);

+	CRYPTOPP_CONSTANT(KEYLENGTH  = KeyLength);

+	CRYPTOPP_CONSTANT(SALTLENGTH = SaltSize);

+	CRYPTOPP_CONSTANT(DIGESTSIZE = DigestSize);

+	CRYPTOPP_CONSTANT(ITERATIONS = Iterations);

 };

 

 typedef DataParametersInfo<LegacyBlockCipher::BLOCKSIZE, LegacyBlockCipher::DEFAULT_KEYLENGTH, LegacyHashModule::DIGESTSIZE, 8, 200> LegacyParametersInfo;

@@ -78,11 +78,11 @@ template <class BC, class H, class Info>
 class DataEncryptor : public ProxyFilter, public Info

 {

 public:

-	CRYPTOPP_CONSTANT(BLOCKSIZE  = Info::BLOCKSIZE)
;

-	CRYPTOPP_CONSTANT(KEYLENGTH  = Info::KEYLENGTH)
;

-	CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH)
;

-	CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE)
;

-	CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS)
;

+	CRYPTOPP_CONSTANT(BLOCKSIZE  = Info::BLOCKSIZE);

+	CRYPTOPP_CONSTANT(KEYLENGTH  = Info::KEYLENGTH);

+	CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);

+	CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);

+	CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);

 

 	/// \brief Construct a DataEncryptor

 	/// \param passphrase a C-String password

@@ -116,11 +116,11 @@ template <class BC, class H, class Info>
 class DataDecryptor : public ProxyFilter, public Info

 {

 public:

-	CRYPTOPP_CONSTANT(BLOCKSIZE  = Info::BLOCKSIZE)
;

-	CRYPTOPP_CONSTANT(KEYLENGTH  = Info::KEYLENGTH)
;

-	CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH)
;

-	CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE)
;

-	CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS)
;

+	CRYPTOPP_CONSTANT(BLOCKSIZE  = Info::BLOCKSIZE);

+	CRYPTOPP_CONSTANT(KEYLENGTH  = Info::KEYLENGTH);

+	CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);

+	CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);

+	CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);

 

 	/// \brief Constructs a DataDecryptor

 	/// \param passphrase a C-String password

@@ -173,11 +173,11 @@ template <class BC, class H, class MAC, class Info>
 class DataEncryptorWithMAC : public ProxyFilter

 {

 public:

-	CRYPTOPP_CONSTANT(BLOCKSIZE  = Info::BLOCKSIZE)
;

-	CRYPTOPP_CONSTANT(KEYLENGTH  = Info::KEYLENGTH)
;

-	CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH)
;

-	CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE)
;

-	CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS)
;

+	CRYPTOPP_CONSTANT(BLOCKSIZE  = Info::BLOCKSIZE);

+	CRYPTOPP_CONSTANT(KEYLENGTH  = Info::KEYLENGTH);

+	CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);

+	CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);

+	CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);

 

 	/// \brief Constructs a DataEncryptorWithMAC

 	/// \param passphrase a C-String password

@@ -218,11 +218,11 @@ template <class BC, class H, class MAC, class Info>
 class DataDecryptorWithMAC : public ProxyFilter

 {

 public:

-	CRYPTOPP_CONSTANT(BLOCKSIZE  = Info::BLOCKSIZE)
;

-	CRYPTOPP_CONSTANT(KEYLENGTH  = Info::KEYLENGTH)
;

-	CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH)
;

-	CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE)
;

-	CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS)
;

+	CRYPTOPP_CONSTANT(BLOCKSIZE  = Info::BLOCKSIZE);

+	CRYPTOPP_CONSTANT(KEYLENGTH  = Info::KEYLENGTH);

+	CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);

+	CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);

+	CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);

 

 	/// \brief Constructs a DataDecryptor

 	/// \param passphrase a C-String password