arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix incorrect type in UncheckedSetKey parameter

pull/2/head
weidai 2006-12-11 09:18:19 +00:00
parent 0d73d34865
commit cde9f938c1
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cbcmac.cpp
View File

@ -6,7 +6,7 @@
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
void CBC_MAC_Base::UncheckedSetKey(const byte *key, size_t length, const NameValuePairs &params) void CBC_MAC_Base::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params)
{ {
AccessCipher().SetKey(key, length, params); AccessCipher().SetKey(key, length, params);
m_reg.CleanNew(AccessCipher().BlockSize()); m_reg.CleanNew(AccessCipher().BlockSize());

2
cbcmac.h
View File

@ -12,7 +12,7 @@ class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE CBC_MAC_Base : public MessageAuthenticatio
public: public:
CBC_MAC_Base() {} CBC_MAC_Base() {}
void UncheckedSetKey(const byte *key, size_t length, const NameValuePairs &params); void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);
void Update(const byte *input, size_t length); void Update(const byte *input, size_t length);
void TruncatedFinal(byte *mac, size_t size); void TruncatedFinal(byte *mac, size_t size);
unsigned int DigestSize() const {return const_cast<CBC_MAC_Base*>(this)->AccessCipher().BlockSize();} unsigned int DigestSize() const {return const_cast<CBC_MAC_Base*>(this)->AccessCipher().BlockSize();}

4
dmac.h
View File

@ -16,7 +16,7 @@ public:
DMAC_Base() {} DMAC_Base() {}
void UncheckedSetKey(const byte *key, size_t length, const NameValuePairs &params); void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);
void Update(const byte *input, size_t length); void Update(const byte *input, size_t length);
void TruncatedFinal(byte *mac, size_t size); void TruncatedFinal(byte *mac, size_t size);
unsigned int DigestSize() const {return DIGESTSIZE;} unsigned int DigestSize() const {return DIGESTSIZE;}
@ -45,7 +45,7 @@ public:
}; };
template <class T> template <class T>
void DMAC_Base<T>::UncheckedSetKey(const byte *key, size_t length, const NameValuePairs &params) void DMAC_Base<T>::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params)
{ {
m_subkeylength = T::StaticGetValidKeyLength(T::BLOCKSIZE); m_subkeylength = T::StaticGetValidKeyLength(T::BLOCKSIZE);
m_subkeys.resize(2*UnsignedMin((unsigned int)T::BLOCKSIZE, m_subkeylength)); m_subkeys.resize(2*UnsignedMin((unsigned int)T::BLOCKSIZE, m_subkeylength));

2
panama.h
View File

@ -46,7 +46,7 @@ template <class T_Hash, class T_Info = T_Hash>
class HermeticHashFunctionMAC : public AlgorithmImpl<SimpleKeyingInterfaceImpl<TwoBases<MessageAuthenticationCode, VariableKeyLength<32, 0, UINT_MAX> > >, T_Info> class HermeticHashFunctionMAC : public AlgorithmImpl<SimpleKeyingInterfaceImpl<TwoBases<MessageAuthenticationCode, VariableKeyLength<32, 0, UINT_MAX> > >, T_Info>
{ {
public: public:
void UncheckedSetKey(const byte *key, size_t length, const NameValuePairs &params) void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params)
{ {
m_key.Assign(key, length); m_key.Assign(key, length);
Restart(); Restart();

4
xormac.h
View File

@ -23,7 +23,7 @@ public:
XMACC_Base() {SetStateSize(T::DIGESTSIZE);} XMACC_Base() {SetStateSize(T::DIGESTSIZE);}
void UncheckedSetKey(const byte *key, size_t length, const NameValuePairs &params); void UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params);
void Resynchronize(const byte *IV) void Resynchronize(const byte *IV)
{ {
GetWord(false, BIG_ENDIAN_ORDER, m_counter, IV); GetWord(false, BIG_ENDIAN_ORDER, m_counter, IV);
@ -70,7 +70,7 @@ public:
{this->SetKey(key, this->KEYLENGTH, MakeParameters(Name::XMACC_Counter(), counter));} {this->SetKey(key, this->KEYLENGTH, MakeParameters(Name::XMACC_Counter(), counter));}
}; };
template <class T> void XMACC_Base<T>::UncheckedSetKey(const byte *key, size_t length, const NameValuePairs &params) template <class T> void XMACC_Base<T>::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs &params)
{ {
this->AssertValidKeyLength(length); this->AssertValidKeyLength(length);
m_counter = 0xffffffff; m_counter = 0xffffffff;