summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2016-09-13 19:52:45 -0400
committerJeffrey Walton <noloader@gmail.com>2016-09-13 19:52:45 -0400
commitdf7e07e75e302f34d8968f65ab8126333b006ae5 (patch)
tree15490f97a4dfdc82cb0d9686a33c8437ca2bb49a
parent11eede3926c44f774bc268c08ffa0e5412708ff5 (diff)
downloadcryptopp-git-df7e07e75e302f34d8968f65ab8126333b006ae5.tar.gz
The commit had a typo. This reverts commit 11eede3926c44f774bc268c08ffa0e5412708ff5.
-rw-r--r--iterhash.h16
1 files changed, 3 insertions, 13 deletions
diff --git a/iterhash.h b/iterhash.h
index 8a2a81b0..0757687f 100644
--- a/iterhash.h
+++ b/iterhash.h
@@ -21,8 +21,7 @@ public:
//! \brief Iterated hash base class
//! \tparam T Hash word type
//! \tparam BASE HashTransformation derived class
-//! \details IteratedHashBase() provides an interface for derived classes. BASE should be derived from
-//! HashTransformation, MessageAuthenticationCode, or a similar class.
+//! \details BASE should be derived from HashTransformation, MessageAuthenticationCode, or similar class.
//! \sa HashTransformation, MessageAuthenticationCode
template <class T, class BASE>
class CRYPTOPP_NO_VTABLE IteratedHashBase : public BASE
@@ -96,8 +95,7 @@ private:
//! \tparam T_Endianness Endianness type of hash
//! \tparam T_BlockSize Block size of the hash
//! \tparam T_Base HashTransformation derived class
-//! \details IteratedHash is the first implementation of the IteratedHashBase interface. T_Base should be derived
-//! from HashTransformation, MessageAuthenticationCode, or a similar class.
+//! \details T_Base should be derived from HashTransformation, MessageAuthenticationCode, or similar class.
//! \sa HashTransformation, MessageAuthenticationCode
template <class T_HashWordType, class T_Endianness, unsigned int T_BlockSize, class T_Base = HashTransformation>
class CRYPTOPP_NO_VTABLE IteratedHash : public IteratedHashBase<T_HashWordType, T_Base>
@@ -106,10 +104,6 @@ public:
typedef T_Endianness ByteOrderClass;
typedef T_HashWordType HashWordType;
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
- virtual ~IteratedHash() { }
-#endif
-
CRYPTOPP_CONSTANT(BLOCKSIZE = T_BlockSize)
// BCB2006 workaround: can't use BLOCKSIZE here
CRYPTOPP_COMPILE_ASSERT((T_BlockSize & (T_BlockSize - 1)) == 0); // blockSize is a power of 2
@@ -149,7 +143,7 @@ protected:
//! \tparam T_Transform Static transformation class
//! \tparam T_DigestSize Digest size of the hash
//! \tparam T_StateAligned Flag indicating if state is 16-byte aligned
-//! \details T_Transform should be derived from HashTransformation, MessageAuthenticationCode, or a similar class.
+//! \details T_Transform should be derived from HashTransformation, MessageAuthenticationCode, or similar class.
//! \sa HashTransformation, MessageAuthenticationCode
template <class T_HashWordType, class T_Endianness, unsigned int T_BlockSize, unsigned int T_StateSize, class T_Transform, unsigned int T_DigestSize = 0, bool T_StateAligned = false>
class CRYPTOPP_NO_VTABLE IteratedHashWithStaticTransform
@@ -158,10 +152,6 @@ class CRYPTOPP_NO_VTABLE IteratedHashWithStaticTransform
public:
CRYPTOPP_CONSTANT(DIGESTSIZE = T_DigestSize ? T_DigestSize : T_StateSize)
-#ifndef CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562
- virtual ~ClonableImpl() { }
-#endif
-
//! Provides the digest size of the hash
//! \return the digest size of the hash.
//! details DigestSize() returns <tt>DIGESTSIZE</tt>.