From 8d60521f8c06dfcdb4db058d3a44d5f3f357b821 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 30 Mar 2018 16:40:15 -0400 Subject: [PATCH] Remove unneeded ThrowIfInvalidDerivedLength in DeriveKey --- hkdf.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hkdf.h b/hkdf.h index 53eed7fc..79833be8 100644 --- a/hkdf.h +++ b/hkdf.h @@ -30,17 +30,20 @@ public: return name; } + // KeyDerivationFunction interface std::string AlgorithmName() const { return StaticAlgorithmName(); } + // KeyDerivationFunction interface size_t MaxDerivedLength() const { return static_cast(T::DIGESTSIZE) * 255; } + // KeyDerivationFunction interface size_t GetValidDerivedLength(size_t keylength) const; - // Base class override + // KeyDerivationFunction interface size_t DeriveKey(byte *derived, size_t derivedLen, const byte *secret, size_t secretLen, const NameValuePairs& params) const; @@ -99,8 +102,6 @@ size_t HKDF::DeriveKey(byte *derived, size_t derivedLen, CRYPTOPP_ASSERT(derived && derivedLen); CRYPTOPP_ASSERT(derivedLen <= MaxDerivedLength()); - ThrowIfInvalidDerivedLength(derivedLen); - ConstByteArrayParameter p; SecByteBlock salt, info;