prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace C type conversion with static_cast

Browse Source
This commit is contained in:
Hanjie Wu
2021-10-22 15:42:26 +08:00
parent 1e32807794
commit 7ead7f26df
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/crypto/aes_util_openssl.cpp
View File

@@ -64,23 +64,23 @@ void AESCipher<Key, KeySize>::Transcode(const u8* src, std::size_t size, u8* des
int written, last_written; int written, last_written;
if (EVP_CIPHER_mode(ctx->cipher) == EVP_CIPH_XTS_MODE) { if (EVP_CIPHER_mode(ctx->cipher) == EVP_CIPH_XTS_MODE) {
EVP_CipherUpdate(ctx->ctx.get(), dest, &written, src, (int)size); EVP_CipherUpdate(ctx->ctx.get(), dest, &written, src, static_cast<int>(size));
if (written != (int)size) { if (written != static_cast<int>(size)) {
LOG_WARNING(Crypto, "Not all data was decrypted requested={:016X}, actual={:016X}.", LOG_WARNING(Crypto, "Not all data was decrypted requested={:016X}, actual={:016X}.",
size, written); size, written);
} }
} else { } else {
std::size_t block_size = EVP_CIPHER_block_size(ctx->cipher); std::size_t block_size = EVP_CIPHER_block_size(ctx->cipher);
std::size_t remain = size % block_size; 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<int>(size - remain));
if (remain != 0) { if (remain != 0) {
std::vector<u8> block(block_size); std::vector<u8> block(block_size);
std::memcpy(block.data(), src + size - remain, remain); std::memcpy(block.data(), src + size - remain, remain);
EVP_CipherUpdate(ctx->ctx.get(), dest + written, &last_written, block.data(), EVP_CipherUpdate(ctx->ctx.get(), dest + written, &last_written, block.data(),
(int)block_size); static_cast<int>(block_size));
written += last_written; written += last_written;
} }
if (written != (int)size) { if (written != static_cast<int>(size)) {
LOG_WARNING(Crypto, "Not all data was decrypted requested={:016X}, actual={:016X}.", LOG_WARNING(Crypto, "Not all data was decrypted requested={:016X}, actual={:016X}.",
size, written + last_written); size, written + last_written);
} }

12
src/core/crypto/crypto_openssl.cpp
View File

@@ -11,7 +11,7 @@
bool CalculateHMACSHA256(u8* out, const u8* key, std::size_t key_length, const u8* data, bool CalculateHMACSHA256(u8* out, const u8* key, std::size_t key_length, const u8* data,
std::size_t data_length) { std::size_t data_length) {
HMAC(EVP_sha256(), key, (int)key_length, data, data_length, out, NULL); HMAC(EVP_sha256(), key, static_cast<int>(key_length), data, data_length, out, NULL);
return true; 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* N = BN_CTX_get(ctx);
BIGNUM* S = BN_CTX_get(ctx); BIGNUM* S = BN_CTX_get(ctx);
BIGNUM* M = BN_CTX_get(ctx); BIGNUM* M = BN_CTX_get(ctx);
BN_bin2bn(d, (int)d_length, D); BN_bin2bn(d, static_cast<int>(d_length), D);
BN_bin2bn(n, (int)n_length, N); BN_bin2bn(n, static_cast<int>(n_length), N);
BN_bin2bn(s, (int)s_length, S); BN_bin2bn(s, static_cast<int>(s_length), S);
BN_mod_exp(M, S, D, N, ctx); BN_mod_exp(M, S, D, N, ctx);
BN_bn2bin(M, m); BN_bn2bin(M, m);
BN_CTX_end(ctx); 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, void GenerateRandomBytesWithSeed(u8* out, std::size_t out_length, const u8* seed,
std::size_t seed_length) { std::size_t seed_length) {
RAND_seed((const void*)seed, (int)seed_length); RAND_seed(static_cast<const void*>(seed), static_cast<int>(seed_length));
ASSERT(RAND_bytes(out, (int)out_length) == 1); ASSERT(RAND_bytes(out, static_cast<int>(out_length)) == 1);
} }
#endif #endif