From 2af9ba577730f071eef44b3ba492c3bfad0a8ec6 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Tue, 12 Oct 2010 23:29:55 +0000
Subject: Use size_t for BufferedComputation::add_data

---
 src/pbkdf/pbkdf2/pbkdf2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/pbkdf')

diff --git a/src/pbkdf/pbkdf2/pbkdf2.cpp b/src/pbkdf/pbkdf2/pbkdf2.cpp
index b1c7b2e07..88131da01 100644
--- a/src/pbkdf/pbkdf2/pbkdf2.cpp
+++ b/src/pbkdf/pbkdf2/pbkdf2.cpp
@@ -42,7 +42,7 @@ OctetString PKCS5_PBKDF2::derive_key(u32bit key_len,
    u32bit counter = 1;
    while(key_len)
       {
-      u32bit T_size = std::min(mac->OUTPUT_LENGTH, key_len);
+      u32bit T_size = std::min<u32bit>(mac->OUTPUT_LENGTH, key_len);
 
       mac->update(salt, salt_size);
       for(u32bit j = 0; j != 4; ++j)
-- 
cgit v1.2.3