Merge GH #2010 Fix MSVC warnings

2 files changed, 3 insertions, 2 deletions

diff --git a/src/cli/speed.cpp b/src/cli/speed.cpp
index a481ec16a..f198c3e63 100644
--- a/src/cli/speed.cpp
+++ b/src/cli/speed.cpp
@@ -2211,6 +2211,8 @@ class Speed final : public Command
       void bench_argon2(const std::string& /*provider*/,
                         std::chrono::milliseconds msec)
          {
+         const uint8_t mode = 2; // Argon2id
+
          for(size_t M : { 8*1024, 64*1024, 256*1024 })
             {
             for(size_t t : { 1, 2, 4 })
@@ -2220,7 +2222,6 @@ class Speed final : public Command
                   std::unique_ptr<Timer> timer = make_timer(
                      "Argon2id M=" + std::to_string(M) + " t=" + std::to_string(t) + " p=" + std::to_string(p));
 
-                  const size_t mode = 2;
                   uint8_t out[64];
                   uint8_t salt[16];
                   rng().randomize(salt, sizeof(salt));
diff --git a/src/cli/tls_client.cpp b/src/cli/tls_client.cpp
index f2fc40210..26e1f4b25 100644
--- a/src/cli/tls_client.cpp
+++ b/src/cli/tls_client.cpp
@@ -91,7 +91,7 @@ class TLS_Client final : public Command, public Botan::TLS::Callbacks
 
          const std::string sessions_db = get_arg("session-db");
          const std::string host = get_arg("host");
-         const uint16_t port = get_arg_sz("port");
+         const uint16_t port = static_cast<uint16_t>(get_arg_sz("port"));
          const std::string transport = get_arg("type");
          const std::string next_protos = get_arg("next-protocols");
          std::string policy_file = get_arg("policy");