diff --git a/keccak.h b/keccak.h index 9103963d..6bef493f 100644 --- a/keccak.h +++ b/keccak.h @@ -2,9 +2,8 @@ //! \file keccak.h //! \brief Classes for Keccak message digests -//! \details The Keccak classes use F1600 and XOF byte 0x80, which is effectively -//! the behavior specified by NIST at round three of the selection process. If you -//! desire FIPS 202 behavior, then use SHA3 classes. +//! \details The Crypto++ Keccak implementation uses F1600 with XOF d=0x01. +//! FIPS 202 conformance (XOF d=0x06) is available in SHA3 classes. //! \details Keccak will likely change in the future to accomodate extensibility of the //! round function and the XOF functions. //! \sa Keccak @@ -20,9 +19,8 @@ NAMESPACE_BEGIN(CryptoPP) //! \class Keccak //! \brief Keccak message digest base class -//! \details The Keccak classes use F1600 and XOF byte 0x80, which is effectively -//! the behavior specified by NIST at round three of the selection process. If you -//! desire FIPS 202 behavior, then use SHA3 classes. +//! \details The Crypto++ Keccak implementation uses F1600 with XOF d=0x06. +//! FIPS 202 conformance (XOF d=0x01) is available in SHA3 classes. //! \details Keccak is the base class for Keccak_224, Keccak_256, Keccak_384 and Keccak_512. //! Library users should instantiate a derived class, and only use Keccak //! as a base class reference or pointer. diff --git a/sha3.h b/sha3.h index 2f111845..9d5691eb 100644 --- a/sha3.h +++ b/sha3.h @@ -1,9 +1,9 @@ // sha3.h - written and placed in the public domain by Wei Dai //! \file sha3.h -//! \brief Classes for SHA-3 message digests -//! \details The Crypto++ SHA-3 conforms to FIPS 202 version of SHA-3. -//! Previous behavior is available in SHA3 classes. +//! \brief Classes for SHA3 message digests +//! \details The Crypto++ implementation conforms to the FIPS 202 version of SHA3 using F1600 with XOF d=0x06. +//! Previous behavior (XOF d=0x01) is available in Keccak classes. //! \sa SHA-3, //! SHA-3 STANDARD (FIPS 202). //! \since Crypto++ 5.6.2 @@ -18,11 +18,13 @@ NAMESPACE_BEGIN(CryptoPP) //! \class SHA3 //! \brief SHA3 message digest base class - //! \details SHA3 is the base class for SHA3_224, SHA3_256, SHA3_384 and SHA3_512. - //! Library users should instantiate a derived class, and only use SHA3 - //! as a base class reference or pointer. - //! \sa Keccak, SHA3_224, SHA3_256, SHA3_384 and SHA3_512. - //! \since Crypto++ 5.6.2 +//! \details The Crypto++ implementation conforms to FIPS 202 version of SHA3 usinf F1600 with XOF d=0x06. +//! Previous behavior (XOF d=0x01) is available in Keccak classes. +//! \details SHA3 is the base class for SHA3_224, SHA3_256, SHA3_384 and SHA3_512. +//! Library users should instantiate a derived class, and only use SHA3 +//! as a base class reference or pointer. +//! \sa Keccak, SHA3_224, SHA3_256, SHA3_384 and SHA3_512. +//! \since Crypto++ 5.6.2 class SHA3 : public HashTransformation { public: