moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-07-01 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't depend on outputDataLength to be initialized with mbedTLS

Browse Source 
OpenSSL has no such requirement, so MbedTLS breakages snuck in.
This commit is contained in:
Cameron Gutman 2024-03-05 21:09:57 -06:00
parent 48d7f1ace1
commit eb21561541
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PlatformCrypto.c
View File

@ -71,8 +71,6 @@ bool PltEncryptMessage(PPLT_CRYPTO_CONTEXT ctx, int algorithm, int flags,
ctx->initialized = true; ctx->initialized = true;
} }
outLength = *outputDataLength;
if (tag != NULL) { if (tag != NULL) {
#ifdef USE_MBEDTLS_CRYPTO_EXT #ifdef USE_MBEDTLS_CRYPTO_EXT
// In mbedTLS, tag is always after ciphertext, while we need to put tag BEFORE ciphertext here // In mbedTLS, tag is always after ciphertext, while we need to put tag BEFORE ciphertext here
@ -88,7 +86,7 @@ bool PltEncryptMessage(PPLT_CRYPTO_CONTEXT ctx, int algorithm, int flags,
#endif #endif
size_t encryptedLength = 0; size_t encryptedLength = 0;
unsigned char * encryptedData = tag; unsigned char * encryptedData = tag;
size_t encryptedCapacity = outLength + tagLength; size_t encryptedCapacity = inputDataLength + tagLength;
if (mbedtls_cipher_auth_encrypt_ext(&ctx->ctx, iv, ivLength, NULL, 0, inputData, inputDataLength, encryptedData, if (mbedtls_cipher_auth_encrypt_ext(&ctx->ctx, iv, ivLength, NULL, 0, inputData, inputDataLength, encryptedData,
encryptedCapacity, &encryptedLength, tagLength) != 0) { encryptedCapacity, &encryptedLength, tagLength) != 0) {
return false; return false;
@ -273,8 +271,6 @@ bool PltDecryptMessage(PPLT_CRYPTO_CONTEXT ctx, int algorithm, int flags,
ctx->initialized = true; ctx->initialized = true;
} }
outLength = *outputDataLength;
if (tag != NULL) { if (tag != NULL) {
#ifdef USE_MBEDTLS_CRYPTO_EXT #ifdef USE_MBEDTLS_CRYPTO_EXT
// We only support 16 bytes sized tag // We only support 16 bytes sized tag
@ -296,7 +292,7 @@ bool PltDecryptMessage(PPLT_CRYPTO_CONTEXT ctx, int algorithm, int flags,
// Copy back tag to the end // Copy back tag to the end
memcpy(encryptedData + inputDataLength, tagTemp, tagLength); memcpy(encryptedData + inputDataLength, tagTemp, tagLength);
if (mbedtls_cipher_auth_decrypt_ext(&ctx->ctx, iv, ivLength, NULL, 0, encryptedData, encryptedDataLen, if (mbedtls_cipher_auth_decrypt_ext(&ctx->ctx, iv, ivLength, NULL, 0, encryptedData, encryptedDataLen,
outputData, outLength, &outLength, tagLength) != 0) { outputData, inputDataLength, &outLength, tagLength) != 0) {
return false; return false;
} }
#else #else