moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-08-17 17:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary calls to EVP_CIPHER_CTX_reset()

Browse Source 
EVP_EncryptInit_ex() and EVP_DecryptInit_ex() free the cipher state as required
This commit is contained in:
Cameron Gutman 2021-04-22 00:17:46 -05:00
parent 625ec431eb
commit 55cf1f8d30
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/PlatformCrypto.c
View File

@ -11,10 +11,6 @@ bool RandomStateInitialized = false;
#include <openssl/evp.h>
#include <openssl/rand.h>
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x); EVP_CIPHER_CTX_init(x)
#endif
static int addPkcs7PaddingInPlace(unsigned char* plaintext, int plaintextLen) {
int paddedLength = ROUND_TO_PKCS7_PADDED_LEN(plaintextLen);
unsigned char paddingByte = (unsigned char)(16 - (plaintextLen % 16));
@ -103,8 +99,6 @@ bool PltEncryptMessage(PPLT_CRYPTO_CONTEXT ctx, int algorithm, int flags,
}
if (algorithm == ALGORITHM_AES_GCM) {
EVP_CIPHER_CTX_reset(ctx->ctx);
if (EVP_EncryptInit_ex(ctx->ctx, cipher, NULL, NULL, NULL) != 1) {
return false;
}
@ -119,8 +113,6 @@ bool PltEncryptMessage(PPLT_CRYPTO_CONTEXT ctx, int algorithm, int flags,
}
else {
if (!ctx->initialized || (flags & CIPHER_FLAG_RESET_IV)) {
EVP_CIPHER_CTX_reset(ctx->ctx);
if (EVP_EncryptInit_ex(ctx->ctx, cipher, NULL, key, iv) != 1) {
return false;
}
@ -240,8 +232,6 @@ bool PltDecryptMessage(PPLT_CRYPTO_CONTEXT ctx, int algorithm, int flags,
}
if (algorithm == ALGORITHM_AES_GCM) {
EVP_CIPHER_CTX_reset(ctx->ctx);
if (EVP_DecryptInit_ex(ctx->ctx, cipher, NULL, NULL, NULL) != 1) {
return false;
}
@ -256,8 +246,6 @@ bool PltDecryptMessage(PPLT_CRYPTO_CONTEXT ctx, int algorithm, int flags,
}
else {
if (!ctx->initialized || (flags & CIPHER_FLAG_RESET_IV)) {
EVP_CIPHER_CTX_reset(ctx->ctx);
if (EVP_DecryptInit_ex(ctx->ctx, cipher, NULL, key, iv) != 1) {
return false;
}