aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ffi
diff options
context:
space:
mode:
authorJack Lloyd <jack@randombit.net>2017-08-31 07:13:58 -0400
committerJack Lloyd <jack@randombit.net>2017-08-31 07:13:58 -0400
commitdf4287c3c763de14b262ed39d54b3de552adbefb (patch)
tree10b839bab8d2e36a806951bb2e5e5f0212f7a0f9 /src/lib/ffi
parent17ef09021892afc4c0e9fe7ba97423bf832e6dc5 (diff)
Fix various MSVC warnings
Based on VC2017 output
Diffstat (limited to 'src/lib/ffi')
-rw-r--r--src/lib/ffi/ffi_cipher.cpp2
-rw-r--r--src/lib/ffi/ffi_kdf.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffi/ffi_cipher.cpp b/src/lib/ffi/ffi_cipher.cpp
index 6bb45dec8..72fa2eec8 100644
--- a/src/lib/ffi/ffi_cipher.cpp
+++ b/src/lib/ffi/ffi_cipher.cpp
@@ -100,7 +100,7 @@ int botan_cipher_update(botan_cipher_t cipher_obj,
{
cipher.finish(mbuf);
}
- catch(Integrity_Failure& e)
+ catch(Integrity_Failure&)
{
return BOTAN_FFI_ERROR_BAD_MAC;
}
diff --git a/src/lib/ffi/ffi_kdf.cpp b/src/lib/ffi/ffi_kdf.cpp
index 058c4c655..4eca31773 100644
--- a/src/lib/ffi/ffi_kdf.cpp
+++ b/src/lib/ffi/ffi_kdf.cpp
@@ -76,7 +76,7 @@ int botan_bcrypt_generate(uint8_t* out, size_t* out_len,
throw FFI_Error("Bad bcrypt work factor " + std::to_string(wf));
Botan::RandomNumberGenerator& rng = safe_get(rng_obj);
- const std::string bcrypt = Botan::generate_bcrypt(pass, rng, wf);
+ const std::string bcrypt = Botan::generate_bcrypt(pass, rng, static_cast<uint16_t>(wf));
return write_str_output(out, out_len, bcrypt);
});
#else