diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2019-10-03 19:40:53 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2019-10-03 19:40:53 -0400 |
| commit | 589c25264a3b15fae101962f8a8a334a03c90075 (patch) | |
| tree | d8493fa92058af7139d9eeb75358623e44a4d631 /default.h | |
| parent | eff2b4f05a432a745d5912ec99f8c8ac85ebbaa6 (diff) | |
| download | cryptopp-git-589c25264a3b15fae101962f8a8a334a03c90075.tar.gz | |
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.
Diffstat (limited to 'default.h')
| -rw-r--r-- | default.h | 50 |
1 files changed, 25 insertions, 25 deletions
@@ -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
|