summaryrefslogtreecommitdiff
path: root/sha3.h
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2016-09-08 20:24:25 -0400
committerJeffrey Walton <noloader@gmail.com>2016-09-08 20:24:25 -0400
commit7f958575eaf267c8011e25dfbe6350b818524ff4 (patch)
treeaa9577e74e276b5ca88fb71d6cc09be1de2ea465 /sha3.h
parent42085eea4194c10be60caab7ca3626ecb9716b19 (diff)
downloadcryptopp-git-7f958575eaf267c8011e25dfbe6350b818524ff4.tar.gz
Squashed commit of the following:
commit 47c75c6e9397e240919207e50e5a611d3e2a2428 Merge: d7685c2 42085ee Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 20:20:39 2016 -0400 Attempting to fix binary file merge conflict commit d7685c2d946beecc419ddb6901c24e972c7cf3ee Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 16:39:23 2016 -0400 Add vsClean.cmd to vs2010.zip commit 4b96fdf1c551260da60eb021f324bcc3fcfec626 Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 16:15:38 2016 -0400 Add Keccak to vs2010.zip commit 3962db73b7113ee805b46a5bb4da64e204fe6bb0 Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 15:40:35 2016 -0400 Fold hmqv.cpp and fhmqv.cpp into mqv.cpp. There's no need for three empty source files commit 44401448cbb6c8125b0f1ab4419c5b174408ffd7 Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 15:39:23 2016 -0400 Fold hmqv.cpp and fhmqv.cpp into mqv.cpp. There's no need for three empty source files commit 847bfccb8d5c388e67745dc8c69768fa503c5135 Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 14:48:02 2016 -0400 Whitespace cleanup commit 46a37be6fef361704dcf852bc9a099ce0a1da4c8 Merge: aefb8f8 3697867 Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 14:43:01 2016 -0400 Merge 'master' into 'keccak' commit aefb8f8ff2b81b967089c53b457a92fc6f7544d6 Merge: 51a828b 3c91d93 Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 12:39:51 2016 -0400 Merge 'master' into 'keccak' commit 51a828b88e37a4d18abb00300cd5522bd0e110c5 Merge: 4152870 e7c7722 Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 10:41:36 2016 -0400 Merge 'master' into 'keccak' commit 415287041e69ddadf5ca1f6fc794b87e145fc2db Merge: 357a0c5 83ac849 Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 10:34:45 2016 -0400 Merge 'master' into 'keccak' commit 357a0c510f75e4e58078b500dd469462e90f7650 Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 10:13:32 2016 -0400 Removed deprecated warning from SHA3 classes commit 5cf9ec10d53b895b5a583e265e4e1298ed402195 Merge: 10ce0ed c2d60cc Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 09:43:15 2016 -0400 Merge 'master' into 'keccak' commit 10ce0ed4c5b8a1ea230062fd2dfdec0d87ec5b42 Author: Jeffrey Walton <noloader@gmail.com> Date: Thu Sep 8 09:37:40 2016 -0400 Add Keccak implementation based on early SHA3. Change SHA3 to NIST FIPS 202 conforming implementation
Diffstat (limited to 'sha3.h')
-rw-r--r--sha3.h28
1 files changed, 13 insertions, 15 deletions
diff --git a/sha3.h b/sha3.h
index d0222150..ed3a03b8 100644
--- a/sha3.h
+++ b/sha3.h
@@ -2,12 +2,10 @@
//! \file sha3.h
//! \brief Classes for SHA-3 message digests
-//! \details The Crypto++ SHA-3 implementation dates back to January 2013 when NIST
-//! selected Keccak as SHA-3. In August 2015 NIST finalized SHA-3, and it was a
-//! modified version of the Keccak selection. Crypto++ 5.6.2 through 5.6.4 provides
-//! the pre-FIPS 202 version of SHA-3; while Crypto++ 5.7 and above provides
-//! the FIPS 202 version of SHA-3.
-//! \sa <a href="http://en.wikipedia.org/wiki/SHA-3">SHA-3</a>
+//! \details The Crypto++ SHA-3 conforms to FIPS 202 version of SHA-3.
+//! Previous behavior is available in Keccak classes.
+//! \sa <a href="http://en.wikipedia.org/wiki/SHA-3">SHA-3</a>,
+//! <A HREF="http://csrc.nist.gov/groups/ST/hash/sha-3/fips202_standard_2015.html">SHA-3 STANDARD (FIPS 202)</A>.
#ifndef CRYPTOPP_SHA3_H
#define CRYPTOPP_SHA3_H
@@ -29,7 +27,7 @@ public:
//! as a base class reference or pointer.
SHA3(unsigned int digestSize) : m_digestSize(digestSize) {Restart();}
unsigned int DigestSize() const {return m_digestSize;}
- std::string AlgorithmName() const {return "SHA-3-" + IntToString(m_digestSize*8);}
+ std::string AlgorithmName() const {return "SHA3-" + IntToString(m_digestSize*8);}
unsigned int OptimalDataAlignment() const {return GetAlignmentOf<word64>();}
void Update(const byte *input, size_t length);
@@ -52,8 +50,8 @@ public:
//! \brief Construct a SHA3-224 message digest
SHA3_224() : SHA3(DIGESTSIZE) {}
- CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "SHA-3-224";}
-} CRYPTOPP_DEPRECATED("SHA-3 will be changing in the future due to FIPS 202 finalization");
+ CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "SHA3-224";}
+};
//! \class SHA3_256
//! \brief SHA3-256 message digest
@@ -64,8 +62,8 @@ public:
//! \brief Construct a SHA3-256 message digest
SHA3_256() : SHA3(DIGESTSIZE) {}
- CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "SHA-3-256";}
-} CRYPTOPP_DEPRECATED("SHA-3 will be changing in the future due to FIPS 202 finalization");
+ CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "SHA3-256";}
+};
//! \class SHA3_384
//! \brief SHA3-384 message digest
@@ -76,8 +74,8 @@ public:
//! \brief Construct a SHA3-384 message digest
SHA3_384() : SHA3(DIGESTSIZE) {}
- CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "SHA-3-384";}
-} CRYPTOPP_DEPRECATED("SHA-3 will be changing in the future due to FIPS 202 finalization");
+ CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "SHA3-384";}
+};
//! \class SHA3_512
//! \brief SHA3-512 message digest
@@ -88,8 +86,8 @@ public:
//! \brief Construct a SHA3-512 message digest
SHA3_512() : SHA3(DIGESTSIZE) {}
- CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "SHA-3-512";}
-} CRYPTOPP_DEPRECATED("SHA-3 will be changing in the future due to FIPS 202 finalization");
+ CRYPTOPP_CONSTEXPR static const char *StaticAlgorithmName() {return "SHA3-512";}
+};
NAMESPACE_END