Skip to content

Commit 9013cb6

Browse files
noloadernoloader
committed
Fix semicolons yet again (GH weidai11#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 parent 6f36f0d commit 9013cb6

31 files changed

+220
-223
lines changed

‎adler32.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ NAMESPACE_BEGIN(CryptoPP)
1414
class Adler32 : public HashTransformation
1515
{
1616
public:
17-
CRYPTOPP_CONSTANT(DIGESTSIZE = 4);
17+
CRYPTOPP_CONSTANT(DIGESTSIZE = 4);
1818
Adler32() {Reset();}
1919
void Update(const byte *input, size_t length);
2020
void TruncatedFinal(byte *hash, size_t size);

‎aes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ NAMESPACE_BEGIN(CryptoPP)
2020
/// \sa <a href="http://www.cryptolounge.org/wiki/AES">AES</a> winner, announced on 10/2/2000
2121
/// \since Rijndael since Crypto++ 3.1, Intel AES-NI since Crypto++ 5.6.1, ARMv8 AES since Crypto++ 6.0,
2222
/// Power8 AES since Crypto++ 6.0
23-
DOCUMENTED_TYPEDEF(Rijndael, AES);
23+
DOCUMENTED_TYPEDEF(Rijndael, AES);
2424

2525
typedef RijndaelEncryption AESEncryption;
2626
typedef RijndaelDecryption AESDecryption;

‎arc4.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CRYPTOPP_NO_VTABLE ARC4_Base : public VariableKeyLength<16, 1, 256>, publi
4949
/// \brief Alleged RC4
5050
/// \sa <a href="http://www.cryptopp.com/wiki/RC4">Alleged RC4</a>
5151
/// \since Crypto++ 3.1
52-
DOCUMENTED_TYPEDEF(SymmetricCipherFinal<ARC4_Base>, ARC4);
52+
DOCUMENTED_TYPEDEF(SymmetricCipherFinal<ARC4_Base>, ARC4);
5353

5454
/// \brief MARC4 base class
5555
/// \details Implementations and overrides in \p Base apply to both \p ENCRYPTION and \p DECRYPTION directions
@@ -70,7 +70,7 @@ class CRYPTOPP_NO_VTABLE MARC4_Base : public ARC4_Base
7070
/// \brief Modified Alleged RC4
7171
/// \sa <a href="http://www.cryptopp.com/wiki/RC4">Alleged RC4</a>
7272
/// \since Crypto++ 3.1
73-
DOCUMENTED_TYPEDEF(SymmetricCipherFinal<MARC4_Base>, MARC4);
73+
DOCUMENTED_TYPEDEF(SymmetricCipherFinal<MARC4_Base>, MARC4);
7474

7575
}
7676
#if CRYPTOPP_ENABLE_NAMESPACE_WEAK >= 1

‎blake2.h

+37-37
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ NAMESPACE_BEGIN(CryptoPP)
2727
struct BLAKE2s_Info : public VariableKeyLength<32,0,32,1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE>
2828
{
2929
typedef VariableKeyLength<32,0,32,1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE> KeyBase;
30-
CRYPTOPP_CONSTANT(MIN_KEYLENGTH = KeyBase::MIN_KEYLENGTH);
31-
CRYPTOPP_CONSTANT(MAX_KEYLENGTH = KeyBase::MAX_KEYLENGTH);
32-
CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = KeyBase::DEFAULT_KEYLENGTH);
30+
CRYPTOPP_CONSTANT(MIN_KEYLENGTH = KeyBase::MIN_KEYLENGTH);
31+
CRYPTOPP_CONSTANT(MAX_KEYLENGTH = KeyBase::MAX_KEYLENGTH);
32+
CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = KeyBase::DEFAULT_KEYLENGTH);
3333

34-
CRYPTOPP_CONSTANT(BLOCKSIZE = 64);
35-
CRYPTOPP_CONSTANT(DIGESTSIZE = 32);
36-
CRYPTOPP_CONSTANT(SALTSIZE = 8);
37-
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = 8);
34+
CRYPTOPP_CONSTANT(BLOCKSIZE = 64);
35+
CRYPTOPP_CONSTANT(DIGESTSIZE = 32);
36+
CRYPTOPP_CONSTANT(SALTSIZE = 8);
37+
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = 8);
3838

3939
CRYPTOPP_STATIC_CONSTEXPR const char* StaticAlgorithmName() {return "BLAKE2s";}
4040
};
@@ -44,24 +44,24 @@ struct BLAKE2s_Info : public VariableKeyLength<32,0,32,1,SimpleKeyingInterface::
4444
struct BLAKE2b_Info : public VariableKeyLength<64,0,64,1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE>
4545
{
4646
typedef VariableKeyLength<64,0,64,1,SimpleKeyingInterface::NOT_RESYNCHRONIZABLE> KeyBase;
47-
CRYPTOPP_CONSTANT(MIN_KEYLENGTH = KeyBase::MIN_KEYLENGTH);
48-
CRYPTOPP_CONSTANT(MAX_KEYLENGTH = KeyBase::MAX_KEYLENGTH);
49-
CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = KeyBase::DEFAULT_KEYLENGTH);
47+
CRYPTOPP_CONSTANT(MIN_KEYLENGTH = KeyBase::MIN_KEYLENGTH);
48+
CRYPTOPP_CONSTANT(MAX_KEYLENGTH = KeyBase::MAX_KEYLENGTH);
49+
CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = KeyBase::DEFAULT_KEYLENGTH);
5050

51-
CRYPTOPP_CONSTANT(BLOCKSIZE = 128);
52-
CRYPTOPP_CONSTANT(DIGESTSIZE = 64);
53-
CRYPTOPP_CONSTANT(SALTSIZE = 16);
54-
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = 16);
51+
CRYPTOPP_CONSTANT(BLOCKSIZE = 128);
52+
CRYPTOPP_CONSTANT(DIGESTSIZE = 64);
53+
CRYPTOPP_CONSTANT(SALTSIZE = 16);
54+
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = 16);
5555

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

5959
/// \brief BLAKE2s parameter block
6060
struct CRYPTOPP_NO_VTABLE BLAKE2s_ParameterBlock
6161
{
62-
CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2s_Info::SALTSIZE);
63-
CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2s_Info::DIGESTSIZE);
64-
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2s_Info::PERSONALIZATIONSIZE);
62+
CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2s_Info::SALTSIZE);
63+
CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2s_Info::DIGESTSIZE);
64+
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2s_Info::PERSONALIZATIONSIZE);
6565

6666
BLAKE2s_ParameterBlock()
6767
{
@@ -110,9 +110,9 @@ struct CRYPTOPP_NO_VTABLE BLAKE2s_ParameterBlock
110110
/// \brief BLAKE2b parameter block
111111
struct CRYPTOPP_NO_VTABLE BLAKE2b_ParameterBlock
112112
{
113-
CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2b_Info::SALTSIZE);
114-
CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2b_Info::DIGESTSIZE);
115-
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2b_Info::PERSONALIZATIONSIZE);
113+
CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2b_Info::SALTSIZE);
114+
CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2b_Info::DIGESTSIZE);
115+
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2b_Info::PERSONALIZATIONSIZE);
116116

117117
BLAKE2b_ParameterBlock()
118118
{
@@ -185,7 +185,7 @@ struct CRYPTOPP_NO_VTABLE BLAKE2s_State
185185
}
186186

187187
// SSE4, Power7 and NEON depend upon t[] and f[] being side-by-side
188-
CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2s_Info::BLOCKSIZE);
188+
CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2s_Info::BLOCKSIZE);
189189
FixedSizeAlignedSecBlock<word32, 8+2+2, true> m_hft;
190190
FixedSizeAlignedSecBlock<byte, BLOCKSIZE, true> m_buf;
191191
size_t m_len;
@@ -218,7 +218,7 @@ struct CRYPTOPP_NO_VTABLE BLAKE2b_State
218218
}
219219

220220
// SSE4, Power8 and NEON depend upon t[] and f[] being side-by-side
221-
CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2b_Info::BLOCKSIZE);
221+
CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2b_Info::BLOCKSIZE);
222222
FixedSizeAlignedSecBlock<word64, 8+2+2, true> m_hft;
223223
FixedSizeAlignedSecBlock<byte, BLOCKSIZE, true> m_buf;
224224
size_t m_len;
@@ -237,14 +237,14 @@ struct CRYPTOPP_NO_VTABLE BLAKE2b_State
237237
class BLAKE2s : public SimpleKeyingInterfaceImpl<MessageAuthenticationCode, BLAKE2s_Info>
238238
{
239239
public:
240-
CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = BLAKE2s_Info::DEFAULT_KEYLENGTH);
241-
CRYPTOPP_CONSTANT(MIN_KEYLENGTH = BLAKE2s_Info::MIN_KEYLENGTH);
242-
CRYPTOPP_CONSTANT(MAX_KEYLENGTH = BLAKE2s_Info::MAX_KEYLENGTH);
240+
CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = BLAKE2s_Info::DEFAULT_KEYLENGTH);
241+
CRYPTOPP_CONSTANT(MIN_KEYLENGTH = BLAKE2s_Info::MIN_KEYLENGTH);
242+
CRYPTOPP_CONSTANT(MAX_KEYLENGTH = BLAKE2s_Info::MAX_KEYLENGTH);
243243

244-
CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2s_Info::DIGESTSIZE);
245-
CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2s_Info::BLOCKSIZE);
246-
CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2s_Info::SALTSIZE);
247-
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2s_Info::PERSONALIZATIONSIZE);
244+
CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2s_Info::DIGESTSIZE);
245+
CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2s_Info::BLOCKSIZE);
246+
CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2s_Info::SALTSIZE);
247+
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2s_Info::PERSONALIZATIONSIZE);
248248

249249
typedef BLAKE2s_State State;
250250
typedef BLAKE2s_ParameterBlock ParameterBlock;
@@ -344,14 +344,14 @@ class BLAKE2s : public SimpleKeyingInterfaceImpl<MessageAuthenticationCode, BLAK
344344
class BLAKE2b : public SimpleKeyingInterfaceImpl<MessageAuthenticationCode, BLAKE2b_Info>
345345
{
346346
public:
347-
CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = BLAKE2b_Info::DEFAULT_KEYLENGTH);
348-
CRYPTOPP_CONSTANT(MIN_KEYLENGTH = BLAKE2b_Info::MIN_KEYLENGTH);
349-
CRYPTOPP_CONSTANT(MAX_KEYLENGTH = BLAKE2b_Info::MAX_KEYLENGTH);
350-
351-
CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2b_Info::DIGESTSIZE);
352-
CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2b_Info::BLOCKSIZE);
353-
CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2b_Info::SALTSIZE);
354-
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2b_Info::PERSONALIZATIONSIZE);
347+
CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH = BLAKE2b_Info::DEFAULT_KEYLENGTH);
348+
CRYPTOPP_CONSTANT(MIN_KEYLENGTH = BLAKE2b_Info::MIN_KEYLENGTH);
349+
CRYPTOPP_CONSTANT(MAX_KEYLENGTH = BLAKE2b_Info::MAX_KEYLENGTH);
350+
351+
CRYPTOPP_CONSTANT(DIGESTSIZE = BLAKE2b_Info::DIGESTSIZE);
352+
CRYPTOPP_CONSTANT(BLOCKSIZE = BLAKE2b_Info::BLOCKSIZE);
353+
CRYPTOPP_CONSTANT(SALTSIZE = BLAKE2b_Info::SALTSIZE);
354+
CRYPTOPP_CONSTANT(PERSONALIZATIONSIZE = BLAKE2b_Info::PERSONALIZATIONSIZE);
355355

356356
typedef BLAKE2b_State State;
357357
typedef BLAKE2b_ParameterBlock ParameterBlock;

‎cham.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ using CryptoPP::rotrConstant;
4545
template <unsigned int RR, unsigned int KW, class T>
4646
inline void CHAM_EncRound(T x[4], const T k[KW], unsigned int i)
4747
{
48-
CRYPTOPP_CONSTANT(IDX0 = (RR+0) % 4);
49-
CRYPTOPP_CONSTANT(IDX1 = (RR+1) % 4);
50-
CRYPTOPP_CONSTANT(IDX3 = (RR+3+1) % 4);
51-
CRYPTOPP_CONSTANT(R1 = (RR % 2 == 0) ? 1 : 8);
52-
CRYPTOPP_CONSTANT(R2 = (RR % 2 == 0) ? 8 : 1);
48+
CRYPTOPP_CONSTANT(IDX0 = (RR+0) % 4);
49+
CRYPTOPP_CONSTANT(IDX1 = (RR+1) % 4);
50+
CRYPTOPP_CONSTANT(IDX3 = (RR+3+1) % 4);
51+
CRYPTOPP_CONSTANT(R1 = (RR % 2 == 0) ? 1 : 8);
52+
CRYPTOPP_CONSTANT(R2 = (RR % 2 == 0) ? 8 : 1);
5353

5454
// Follows conventions in the ref impl
5555
const T kk = k[i % KW];
@@ -79,11 +79,11 @@ inline void CHAM_EncRound(T x[4], const T k[KW], unsigned int i)
7979
template <unsigned int RR, unsigned int KW, class T>
8080
inline void CHAM_DecRound(T x[4], const T k[KW], unsigned int i)
8181
{
82-
CRYPTOPP_CONSTANT(IDX0 = (RR+0) % 4);
83-
CRYPTOPP_CONSTANT(IDX1 = (RR+1) % 4);
84-
CRYPTOPP_CONSTANT(IDX3 = (RR+3+1) % 4);
85-
CRYPTOPP_CONSTANT(R1 = (RR % 2 == 0) ? 8 : 1);
86-
CRYPTOPP_CONSTANT(R2 = (RR % 2 == 0) ? 1 : 8);
82+
CRYPTOPP_CONSTANT(IDX0 = (RR+0) % 4);
83+
CRYPTOPP_CONSTANT(IDX1 = (RR+1) % 4);
84+
CRYPTOPP_CONSTANT(IDX3 = (RR+3+1) % 4);
85+
CRYPTOPP_CONSTANT(R1 = (RR % 2 == 0) ? 8 : 1);
86+
CRYPTOPP_CONSTANT(R2 = (RR % 2 == 0) ? 1 : 8);
8787

8888
// Follows conventions in the ref impl
8989
const T kk = k[i % KW];

‎cpu.cpp

+17-17
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,8 @@ void DetectX86Features()
328328

329329
// AVX is similar to SSE, but check both bits 27 (SSE) and 28 (AVX).
330330
// https://software.intel.com/en-us/blogs/2011/04/14/is-avx-enabled
331-
CRYPTOPP_CONSTANT(YMM_FLAG = (3 << 1));
332-
CRYPTOPP_CONSTANT(AVX_FLAG = (3 << 27));
331+
CRYPTOPP_CONSTANT(YMM_FLAG = (3 << 1));
332+
CRYPTOPP_CONSTANT(AVX_FLAG = (3 << 27));
333333
if ((cpuid1[2] & AVX_FLAG) == AVX_FLAG)
334334
{
335335

@@ -389,11 +389,11 @@ void DetectX86Features()
389389

390390
if (IsIntel(cpuid0))
391391
{
392-
CRYPTOPP_CONSTANT(RDRAND_FLAG = (1 << 30));
393-
CRYPTOPP_CONSTANT(RDSEED_FLAG = (1 << 18));
394-
CRYPTOPP_CONSTANT( ADX_FLAG = (1 << 19));
395-
CRYPTOPP_CONSTANT( SHA_FLAG = (1 << 29));
396-
CRYPTOPP_CONSTANT( AVX2_FLAG = (1 << 5));
392+
CRYPTOPP_CONSTANT(RDRAND_FLAG = (1 << 30));
393+
CRYPTOPP_CONSTANT(RDSEED_FLAG = (1 << 18));
394+
CRYPTOPP_CONSTANT( ADX_FLAG = (1 << 19));
395+
CRYPTOPP_CONSTANT( SHA_FLAG = (1 << 29));
396+
CRYPTOPP_CONSTANT( AVX2_FLAG = (1 << 5));
397397

398398
g_isP4 = ((cpuid1[0] >> 8) & 0xf) == 0xf;
399399
g_cacheLineSize = 8 * GETBYTE(cpuid1[1], 1);
@@ -412,11 +412,11 @@ void DetectX86Features()
412412
}
413413
else if (IsAMD(cpuid0) || IsHygon(cpuid0))
414414
{
415-
CRYPTOPP_CONSTANT(RDRAND_FLAG = (1 << 30));
416-
CRYPTOPP_CONSTANT(RDSEED_FLAG = (1 << 18));
417-
CRYPTOPP_CONSTANT( ADX_FLAG = (1 << 19));
418-
CRYPTOPP_CONSTANT( SHA_FLAG = (1 << 29));
419-
CRYPTOPP_CONSTANT( AVX2_FLAG = (1 << 5));
415+
CRYPTOPP_CONSTANT(RDRAND_FLAG = (1 << 30));
416+
CRYPTOPP_CONSTANT(RDSEED_FLAG = (1 << 18));
417+
CRYPTOPP_CONSTANT( ADX_FLAG = (1 << 19));
418+
CRYPTOPP_CONSTANT( SHA_FLAG = (1 << 29));
419+
CRYPTOPP_CONSTANT( AVX2_FLAG = (1 << 5));
420420

421421
CpuId(0x80000005, 0, cpuid2);
422422
g_cacheLineSize = GETBYTE(cpuid2[2], 0);
@@ -436,11 +436,11 @@ void DetectX86Features()
436436
else if (IsVIA(cpuid0))
437437
{
438438
// Two bits: available and enabled
439-
CRYPTOPP_CONSTANT( RNG_FLAGS = (0x3 << 2));
440-
CRYPTOPP_CONSTANT( ACE_FLAGS = (0x3 << 6));
441-
CRYPTOPP_CONSTANT(ACE2_FLAGS = (0x3 << 8));
442-
CRYPTOPP_CONSTANT( PHE_FLAGS = (0x3 << 10));
443-
CRYPTOPP_CONSTANT( PMM_FLAGS = (0x3 << 12));
439+
CRYPTOPP_CONSTANT( RNG_FLAGS = (0x3 << 2));
440+
CRYPTOPP_CONSTANT( ACE_FLAGS = (0x3 << 6));
441+
CRYPTOPP_CONSTANT(ACE2_FLAGS = (0x3 << 8));
442+
CRYPTOPP_CONSTANT( PHE_FLAGS = (0x3 << 10));
443+
CRYPTOPP_CONSTANT( PMM_FLAGS = (0x3 << 12));
444444

445445
CpuId(0xC0000000, 0, cpuid2);
446446
word32 extendedFeatures = cpuid2[0];

‎crc.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const word32 CRC32_NEGL = 0xffffffffL;
2525
class CRC32 : public HashTransformation
2626
{
2727
public:
28-
CRYPTOPP_CONSTANT(DIGESTSIZE = 4);
28+
CRYPTOPP_CONSTANT(DIGESTSIZE = 4);
2929
CRC32();
3030
void Update(const byte *input, size_t length);
3131
void TruncatedFinal(byte *hash, size_t size);
@@ -52,7 +52,7 @@ class CRC32 : public HashTransformation
5252
class CRC32C : public HashTransformation
5353
{
5454
public:
55-
CRYPTOPP_CONSTANT(DIGESTSIZE = 4);
55+
CRYPTOPP_CONSTANT(DIGESTSIZE = 4);
5656
CRC32C();
5757
void Update(const byte *input, size_t length);
5858
void TruncatedFinal(byte *hash, size_t size);

‎default.h

+25-25
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ class MACBadErr : public DataDecryptorErr
5656
template <unsigned int BlockSize, unsigned int KeyLength, unsigned int DigestSize, unsigned int SaltSize, unsigned int Iterations>
5757
struct DataParametersInfo
5858
{
59-
CRYPTOPP_CONSTANT(BLOCKSIZE = BlockSize);
60-
CRYPTOPP_CONSTANT(KEYLENGTH = KeyLength);
61-
CRYPTOPP_CONSTANT(SALTLENGTH = SaltSize);
62-
CRYPTOPP_CONSTANT(DIGESTSIZE = DigestSize);
63-
CRYPTOPP_CONSTANT(ITERATIONS = Iterations);
59+
CRYPTOPP_CONSTANT(BLOCKSIZE = BlockSize);
60+
CRYPTOPP_CONSTANT(KEYLENGTH = KeyLength);
61+
CRYPTOPP_CONSTANT(SALTLENGTH = SaltSize);
62+
CRYPTOPP_CONSTANT(DIGESTSIZE = DigestSize);
63+
CRYPTOPP_CONSTANT(ITERATIONS = Iterations);
6464
};
6565

6666
typedef DataParametersInfo<LegacyBlockCipher::BLOCKSIZE, LegacyBlockCipher::DEFAULT_KEYLENGTH, LegacyHashModule::DIGESTSIZE, 8, 200> LegacyParametersInfo;
@@ -78,11 +78,11 @@ template <class BC, class H, class Info>
7878
class DataEncryptor : public ProxyFilter, public Info
7979
{
8080
public:
81-
CRYPTOPP_CONSTANT(BLOCKSIZE = Info::BLOCKSIZE);
82-
CRYPTOPP_CONSTANT(KEYLENGTH = Info::KEYLENGTH);
83-
CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);
84-
CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);
85-
CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);
81+
CRYPTOPP_CONSTANT(BLOCKSIZE = Info::BLOCKSIZE);
82+
CRYPTOPP_CONSTANT(KEYLENGTH = Info::KEYLENGTH);
83+
CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);
84+
CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);
85+
CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);
8686

8787
/// \brief Construct a DataEncryptor
8888
/// \param passphrase a C-String password
@@ -116,11 +116,11 @@ template <class BC, class H, class Info>
116116
class DataDecryptor : public ProxyFilter, public Info
117117
{
118118
public:
119-
CRYPTOPP_CONSTANT(BLOCKSIZE = Info::BLOCKSIZE);
120-
CRYPTOPP_CONSTANT(KEYLENGTH = Info::KEYLENGTH);
121-
CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);
122-
CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);
123-
CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);
119+
CRYPTOPP_CONSTANT(BLOCKSIZE = Info::BLOCKSIZE);
120+
CRYPTOPP_CONSTANT(KEYLENGTH = Info::KEYLENGTH);
121+
CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);
122+
CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);
123+
CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);
124124

125125
/// \brief Constructs a DataDecryptor
126126
/// \param passphrase a C-String password
@@ -173,11 +173,11 @@ template <class BC, class H, class MAC, class Info>
173173
class DataEncryptorWithMAC : public ProxyFilter
174174
{
175175
public:
176-
CRYPTOPP_CONSTANT(BLOCKSIZE = Info::BLOCKSIZE);
177-
CRYPTOPP_CONSTANT(KEYLENGTH = Info::KEYLENGTH);
178-
CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);
179-
CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);
180-
CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);
176+
CRYPTOPP_CONSTANT(BLOCKSIZE = Info::BLOCKSIZE);
177+
CRYPTOPP_CONSTANT(KEYLENGTH = Info::KEYLENGTH);
178+
CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);
179+
CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);
180+
CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);
181181

182182
/// \brief Constructs a DataEncryptorWithMAC
183183
/// \param passphrase a C-String password
@@ -218,11 +218,11 @@ template <class BC, class H, class MAC, class Info>
218218
class DataDecryptorWithMAC : public ProxyFilter
219219
{
220220
public:
221-
CRYPTOPP_CONSTANT(BLOCKSIZE = Info::BLOCKSIZE);
222-
CRYPTOPP_CONSTANT(KEYLENGTH = Info::KEYLENGTH);
223-
CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);
224-
CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);
225-
CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);
221+
CRYPTOPP_CONSTANT(BLOCKSIZE = Info::BLOCKSIZE);
222+
CRYPTOPP_CONSTANT(KEYLENGTH = Info::KEYLENGTH);
223+
CRYPTOPP_CONSTANT(SALTLENGTH = Info::SALTLENGTH);
224+
CRYPTOPP_CONSTANT(DIGESTSIZE = Info::DIGESTSIZE);
225+
CRYPTOPP_CONSTANT(ITERATIONS = Info::ITERATIONS);
226226

227227
/// \brief Constructs a DataDecryptor
228228
/// \param passphrase a C-String password

‎dmac.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ template <class T>
1717
class CRYPTOPP_NO_VTABLE DMAC_Base : public SameKeyLengthAs<T>, public MessageAuthenticationCode
1818
{
1919
public:
20-
CRYPTOPP_CONSTANT(DIGESTSIZE=T::BLOCKSIZE);
20+
CRYPTOPP_CONSTANT(DIGESTSIZE=T::BLOCKSIZE);
2121
static std::string StaticAlgorithmName() {return std::string("DMAC(") + T::StaticAlgorithmName() + ")";}
2222

2323
virtual~DMAC_Base() {}

0 commit comments

Comments
 (0)