Update documentation

pull/627/head
Jeffrey Walton 2018-03-31 20:25:58 -04:00
parent 4a69b8581d
commit 129d65d987
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 4 additions and 2 deletions

View File

@ -19,6 +19,9 @@
ANONYMOUS_NAMESPACE_BEGIN ANONYMOUS_NAMESPACE_BEGIN
using CryptoPP::byte;
using CryptoPP::word32;
using CryptoPP::word64;
using CryptoPP::rotlConstant; using CryptoPP::rotlConstant;
using CryptoPP::AlignedSecByteBlock; using CryptoPP::AlignedSecByteBlock;
using CryptoPP::LITTLE_ENDIAN_ORDER; using CryptoPP::LITTLE_ENDIAN_ORDER;

View File

@ -60,7 +60,6 @@ public:
/// \param cost the CPU/memory cost factor /// \param cost the CPU/memory cost factor
/// \param blockSize the block size /// \param blockSize the block size
/// \param parallelization the parallelization factor /// \param parallelization the parallelization factor
/// \param infoLen the size of the info buffer, in bytes
/// \returns the number of iterations performed /// \returns the number of iterations performed
/// \throws InvalidDerivedLength if <tt>derivedLen</tt> is invalid for the scheme /// \throws InvalidDerivedLength if <tt>derivedLen</tt> is invalid for the scheme
/// \details DeriveKey() provides a standard interface to derive a key from /// \details DeriveKey() provides a standard interface to derive a key from

View File

@ -837,7 +837,7 @@ bool ValidateScrypt()
{ "pleaseletmein", "SodiumChloride", 16384, 8, 1, "7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887"}, { "pleaseletmein", "SodiumChloride", 16384, 8, 1, "7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887"},
#ifndef CRYPTOPP_DEBUG #ifndef CRYPTOPP_DEBUG
// This one takes too long in debug builds // This one takes too long in debug builds
{ "pleaseletmein", "SodiumChloride", 1048576, 8, 1, "2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4"} // { "pleaseletmein", "SodiumChloride", 1048576, 8, 1, "2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4"}
#endif #endif
}; };