From 517d6a55ca6bb8d6e75078f24b5da9b3fed37d64 Mon Sep 17 00:00:00 2001 From: weidai Date: Mon, 16 Apr 2007 00:43:17 +0000 Subject: [PATCH] IV_REQUIREMENT changes --- seckey.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/seckey.h b/seckey.h index 73b6e302..4adca4b3 100644 --- a/seckey.h +++ b/seckey.h @@ -110,15 +110,16 @@ public: }; /// support query of key length that's the same as another class -template +template class SameKeyLengthAs { public: CRYPTOPP_CONSTANT(MIN_KEYLENGTH=T::MIN_KEYLENGTH) CRYPTOPP_CONSTANT(MAX_KEYLENGTH=T::MAX_KEYLENGTH) CRYPTOPP_CONSTANT(DEFAULT_KEYLENGTH=T::DEFAULT_KEYLENGTH) - CRYPTOPP_CONSTANT(IV_REQUIREMENT = T::IV_REQUIREMENT) - CRYPTOPP_CONSTANT(IV_LENGTH = T::IV_LENGTH) + CRYPTOPP_CONSTANT(IV_REQUIREMENT=IV_REQ) + CRYPTOPP_CONSTANT(IV_LENGTH=IV_L) + static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t keylength) {return T::StaticGetValidKeyLength(keylength);} }; @@ -134,7 +135,7 @@ public: size_t MaxKeyLength() const {return (size_t)INFO::MAX_KEYLENGTH;} size_t DefaultKeyLength() const {return INFO::DEFAULT_KEYLENGTH;} size_t GetValidKeyLength(size_t n) const {return INFO::StaticGetValidKeyLength(n);} - typename BASE::IV_Requirement IVRequirement() const {return (typename BASE::IV_Requirement)INFO::IV_REQUIREMENT;} + SimpleKeyingInterface::IV_Requirement IVRequirement() const {return (SimpleKeyingInterface::IV_Requirement)INFO::IV_REQUIREMENT;} unsigned int IVSize() const {return INFO::IV_LENGTH;} };