From 7ead7f26df884c9f6d33a947ffebb679746adcd4 Mon Sep 17 00:00:00 2001 From: Hanjie Wu Date: Fri, 22 Oct 2021 15:42:26 +0800 Subject: [PATCH] replace C type conversion with static_cast --- src/core/crypto/aes_util_openssl.cpp | 10 +++++----- src/core/crypto/crypto_openssl.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/core/crypto/aes_util_openssl.cpp b/src/core/crypto/aes_util_openssl.cpp index 9e63b71cbd..3cba97d5de 100644 --- a/src/core/crypto/aes_util_openssl.cpp +++ b/src/core/crypto/aes_util_openssl.cpp @@ -64,23 +64,23 @@ void AESCipher::Transcode(const u8* src, std::size_t size, u8* des int written, last_written; if (EVP_CIPHER_mode(ctx->cipher) == EVP_CIPH_XTS_MODE) { - EVP_CipherUpdate(ctx->ctx.get(), dest, &written, src, (int)size); - if (written != (int)size) { + EVP_CipherUpdate(ctx->ctx.get(), dest, &written, src, static_cast(size)); + if (written != static_cast(size)) { LOG_WARNING(Crypto, "Not all data was decrypted requested={:016X}, actual={:016X}.", size, written); } } else { std::size_t block_size = EVP_CIPHER_block_size(ctx->cipher); std::size_t remain = size % block_size; - EVP_CipherUpdate(ctx->ctx.get(), dest, &written, src, (int)(size - remain)); + EVP_CipherUpdate(ctx->ctx.get(), dest, &written, src, static_cast(size - remain)); if (remain != 0) { std::vector block(block_size); std::memcpy(block.data(), src + size - remain, remain); EVP_CipherUpdate(ctx->ctx.get(), dest + written, &last_written, block.data(), - (int)block_size); + static_cast(block_size)); written += last_written; } - if (written != (int)size) { + if (written != static_cast(size)) { LOG_WARNING(Crypto, "Not all data was decrypted requested={:016X}, actual={:016X}.", size, written + last_written); } diff --git a/src/core/crypto/crypto_openssl.cpp b/src/core/crypto/crypto_openssl.cpp index e399c43434..062330a13c 100644 --- a/src/core/crypto/crypto_openssl.cpp +++ b/src/core/crypto/crypto_openssl.cpp @@ -11,7 +11,7 @@ bool CalculateHMACSHA256(u8* out, const u8* key, std::size_t key_length, const u8* data, std::size_t data_length) { - HMAC(EVP_sha256(), key, (int)key_length, data, data_length, out, NULL); + HMAC(EVP_sha256(), key, static_cast(key_length), data, data_length, out, NULL); return true; } @@ -40,9 +40,9 @@ void CalculateModExp(const u8* d, std::size_t d_length, const u8* n, std::size_t BIGNUM* N = BN_CTX_get(ctx); BIGNUM* S = BN_CTX_get(ctx); BIGNUM* M = BN_CTX_get(ctx); - BN_bin2bn(d, (int)d_length, D); - BN_bin2bn(n, (int)n_length, N); - BN_bin2bn(s, (int)s_length, S); + BN_bin2bn(d, static_cast(d_length), D); + BN_bin2bn(n, static_cast(n_length), N); + BN_bin2bn(s, static_cast(s_length), S); BN_mod_exp(M, S, D, N, ctx); BN_bn2bin(M, m); BN_CTX_end(ctx); @@ -51,8 +51,8 @@ void CalculateModExp(const u8* d, std::size_t d_length, const u8* n, std::size_t void GenerateRandomBytesWithSeed(u8* out, std::size_t out_length, const u8* seed, std::size_t seed_length) { - RAND_seed((const void*)seed, (int)seed_length); - ASSERT(RAND_bytes(out, (int)out_length) == 1); + RAND_seed(static_cast(seed), static_cast(seed_length)); + ASSERT(RAND_bytes(out, static_cast(out_length)) == 1); } #endif