Handle the case that container size() returns something other than u32bit

2 files changed, 2 insertions, 2 deletions

diff --git a/src/kdf/kdf2/kdf2.cpp b/src/kdf/kdf2/kdf2.cpp
index 7cc1d7416..b9e785942 100644
--- a/src/kdf/kdf2/kdf2.cpp
+++ b/src/kdf/kdf2/kdf2.cpp
@@ -28,7 +28,7 @@ SecureVector<byte> KDF2::derive(u32bit out_len,
       hash->update(P, P_len);
       SecureVector<byte> hash_result = hash->final();
 
-      u32bit added = std::min(hash_result.size(), out_len);
+      u32bit added = std::min<u32bit>(hash_result.size(), out_len);
       output.append(hash_result, added);
       out_len -= added;
 
diff --git a/src/kdf/mgf1/mgf1.cpp b/src/kdf/mgf1/mgf1.cpp
index 509a411fa..c79ae44bb 100644
--- a/src/kdf/mgf1/mgf1.cpp
+++ b/src/kdf/mgf1/mgf1.cpp
@@ -29,7 +29,7 @@ void MGF1::mask(const byte in[], u32bit in_len, byte out[],
          hash->update(get_byte(j, counter));
       SecureVector<byte> buffer = hash->final();
 
-      u32bit xored = std::min(buffer.size(), out_len);
+      u32bit xored = std::min<u32bit>(buffer.size(), out_len);
       xor_buf(out, &buffer[0], xored);
       out += xored;
       out_len -= xored;