port to MSVC .NET 2005 beta 2

1 files changed, 12 insertions, 12 deletions

diff --git a/dmac.h b/dmac.h
index ad30fb11..fc4c2839 100644
--- a/dmac.h
+++ b/dmac.h
@@ -16,15 +16,15 @@ public:
 
 	DMAC_Base() {}
 
-	void CheckedSetKey(void *, Empty empty, const byte *key, unsigned int length, const NameValuePairs &params);
-	void Update(const byte *input, unsigned int length);
-	void TruncatedFinal(byte *mac, unsigned int size);
+	void CheckedSetKey(void *, Empty empty, const byte *key, size_t length, const NameValuePairs &params);
+	void Update(const byte *input, size_t length);
+	void TruncatedFinal(byte *mac, size_t size);
 	unsigned int DigestSize() const {return DIGESTSIZE;}
 
 private:
-	byte *GenerateSubKeys(const byte *key, unsigned int keylength);
+	byte *GenerateSubKeys(const byte *key, size_t keylength);
 
-	unsigned int m_subkeylength;
+	size_t m_subkeylength;
 	SecByteBlock m_subkeys;
 	CBC_MAC<T> m_mac1;
 	typename T::Encryption m_f2;
@@ -40,15 +40,15 @@ class DMAC : public MessageAuthenticationCodeFinal<DMAC_Base<T> >
 {
 public:
 	DMAC() {}
-	DMAC(const byte *key, unsigned int length=DMAC_Base<T>::DEFAULT_KEYLENGTH)
+	DMAC(const byte *key, size_t length=DMAC_Base<T>::DEFAULT_KEYLENGTH)
 		{this->SetKey(key, length);}
 };
 
 template <class T>
-void DMAC_Base<T>::CheckedSetKey(void *, Empty empty, const byte *key, unsigned int length, const NameValuePairs &params)
+void DMAC_Base<T>::CheckedSetKey(void *, Empty empty, const byte *key, size_t length, const NameValuePairs &params)
 {
 	m_subkeylength = T::StaticGetValidKeyLength(T::BLOCKSIZE);
-	m_subkeys.resize(2*STDMAX((unsigned int)T::BLOCKSIZE, m_subkeylength));
+	m_subkeys.resize(2*UnsignedMin((unsigned int)T::BLOCKSIZE, m_subkeylength));
 	m_mac1.SetKey(GenerateSubKeys(key, length), m_subkeylength, params);
 	m_f2.SetKey(m_subkeys+m_subkeys.size()/2, m_subkeylength, params);
 	m_counter = 0;
@@ -56,14 +56,14 @@ void DMAC_Base<T>::CheckedSetKey(void *, Empty empty, const byte *key, unsigned
 }
 
 template <class T>
-void DMAC_Base<T>::Update(const byte *input, unsigned int length)
+void DMAC_Base<T>::Update(const byte *input, size_t length)
 {
 	m_mac1.Update(input, length);
-	m_counter = (m_counter + length) % T::BLOCKSIZE;
+	m_counter = (unsigned int)((m_counter + length) % T::BLOCKSIZE);
 }
 
 template <class T>
-void DMAC_Base<T>::TruncatedFinal(byte *mac, unsigned int size)
+void DMAC_Base<T>::TruncatedFinal(byte *mac, size_t size)
 {
 	ThrowIfInvalidTruncatedSize(size);
 
@@ -76,7 +76,7 @@ void DMAC_Base<T>::TruncatedFinal(byte *mac, unsigned int size)
 }
 
 template <class T>
-byte *DMAC_Base<T>::GenerateSubKeys(const byte *key, unsigned int keylength)
+byte *DMAC_Base<T>::GenerateSubKeys(const byte *key, size_t keylength)
 {
 	typename T::Encryption cipher(key, keylength);
 	memset(m_subkeys, 0, m_subkeys.size());