aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/prov
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-10-01 07:11:29 -0400
committerJack Lloyd <[email protected]>2018-10-01 07:11:29 -0400
commita6726aba83c1f7d2508894367979da47ff632684 (patch)
treec5d220b4578cbf955db17a89dcb515e84fbc1145 /src/lib/prov
parent02b089dafe53345c4d3da597bcfe0fb3cc92219e (diff)
Fix more MSVC warnings
Diffstat (limited to 'src/lib/prov')
-rw-r--r--src/lib/prov/pkcs11/p11.h38
1 files changed, 31 insertions, 7 deletions
diff --git a/src/lib/prov/pkcs11/p11.h b/src/lib/prov/pkcs11/p11.h
index dfd89bb0f..597a8e125 100644
--- a/src/lib/prov/pkcs11/p11.h
+++ b/src/lib/prov/pkcs11/p11.h
@@ -1204,7 +1204,10 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
const std::vector<uint8_t, TAlloc>& pin,
ReturnValue* return_value = ThrowException) const
{
- return C_InitPIN(session, reinterpret_cast< Utf8Char* >(const_cast< uint8_t* >(pin.data())), pin.size(), return_value);
+ return C_InitPIN(session,
+ reinterpret_cast< Utf8Char* >(const_cast< uint8_t* >(pin.data())),
+ static_cast<Ulong>(pin.size()),
+ return_value);
}
/**
@@ -1814,7 +1817,10 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
}
encrypted_data.resize(encrypted_size);
- return C_Encrypt(session, const_cast<Byte*>(plaintext_data.data()), plaintext_data.size(), encrypted_data.data(),
+ return C_Encrypt(session,
+ const_cast<Byte*>(plaintext_data.data()),
+ static_cast<Ulong>(plaintext_data.size()),
+ encrypted_data.data(),
&encrypted_size, return_value);
}
@@ -1944,7 +1950,10 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
}
decrypted_data.resize(decrypted_size);
- return C_Decrypt(session, const_cast<Byte*>(encrypted_data.data()), encrypted_data.size(), decrypted_data.data(),
+ return C_Decrypt(session,
+ const_cast<Byte*>(encrypted_data.data()),
+ static_cast<Ulong>(encrypted_data.size()),
+ decrypted_data.data(),
&decrypted_size, return_value);
}
@@ -2169,13 +2178,23 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
ReturnValue* return_value = ThrowException) const
{
Ulong signature_size = 0;
- if(!C_Sign(session, const_cast<Byte*>((data.data())), data.size(), nullptr, &signature_size, return_value))
+ if(!C_Sign(session,
+ const_cast<Byte*>((data.data())),
+ static_cast<Ulong>(data.size()),
+ nullptr,
+ &signature_size,
+ return_value))
{
return false;
}
signature.resize(signature_size);
- return C_Sign(session, const_cast<Byte*>(data.data()), data.size(), signature.data(), &signature_size, return_value);
+ return C_Sign(session,
+ const_cast<Byte*>(data.data()),
+ static_cast<Ulong>(data.size()),
+ signature.data(),
+ &signature_size,
+ return_value);
}
/**
@@ -2392,7 +2411,12 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
std::vector<uint8_t, TAllocB>& signature,
ReturnValue* return_value = ThrowException) const
{
- return C_Verify(session, const_cast<Byte*>(data.data()), data.size(), signature.data(), signature.size(), return_value);
+ return C_Verify(session,
+ const_cast<Byte*>(data.data()),
+ static_cast<Ulong>(data.size()),
+ signature.data(),
+ static_cast<Ulong>(signature.size()),
+ return_value);
}
/**
@@ -2434,7 +2458,7 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
std::vector<uint8_t, TAlloc> part,
ReturnValue* return_value = ThrowException) const
{
- return C_VerifyUpdate(session, part.data(), part.size(), return_value);
+ return C_VerifyUpdate(session, part.data(), static_cast<Ulong>(part.size()), return_value);
}
/**