morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[clang,warnings] fix Wjump-misses-init

Browse Source
This commit is contained in:
Armin Novak
2026-01-08 10:32:30 +01:00
parent 361d0e80f8
commit aabaf91f9c
1 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
libfreerdp/emu/scard/smartcard_virtual_gids.c
View File

@@ -1179,34 +1179,37 @@ static BOOL vgids_perform_decrypt(vgidsContext* context)
goto decrypt_failed;
/* Determine buffer length */
const size_t inlen = Stream_Length(context->commandData);
size_t outlen = 0;
res = EVP_PKEY_decrypt(ctx, NULL, &outlen, Stream_Buffer(context->commandData), inlen);
if (res < 0)
{
WLog_ERR(TAG, "Failed to decrypt data");
goto decrypt_failed;
const size_t inlen = Stream_Length(context->commandData);
size_t outlen = 0;
res = EVP_PKEY_decrypt(ctx, NULL, &outlen, Stream_Buffer(context->commandData), inlen);
if (res < 0)
{
WLog_ERR(TAG, "Failed to decrypt data");
goto decrypt_failed;
}
/* Prepare output buffer */
context->responseData = Stream_New(NULL, outlen);
if (!context->responseData)
{
WLog_ERR(TAG, "Failed to create decryption buffer");
goto decrypt_failed;
}
/* Decrypt */
res = EVP_PKEY_decrypt(ctx, Stream_Buffer(context->responseData), &outlen,
Stream_Buffer(context->commandData), inlen);
if (res < 0)
{
WLog_ERR(TAG, "Failed to decrypt data");
goto decrypt_failed;
}
Stream_SetLength(context->responseData, outlen);
}
/* Prepare output buffer */
context->responseData = Stream_New(NULL, outlen);
if (!context->responseData)
{
WLog_ERR(TAG, "Failed to create decryption buffer");
goto decrypt_failed;
}
/* Decrypt */
res = EVP_PKEY_decrypt(ctx, Stream_Buffer(context->responseData), &outlen,
Stream_Buffer(context->commandData), inlen);
if (res < 0)
{
WLog_ERR(TAG, "Failed to decrypt data");
goto decrypt_failed;
}
Stream_SetLength(context->responseData, outlen);
rc = TRUE;
decrypt_failed:
@@ -1529,11 +1532,13 @@ BOOL vgids_init(vgidsContext* ctx, const char* cert, const char* privateKey, con
goto init_failed;
/* write container map DO */
const size_t size = get_rsa_key_size(ctx->privateKey);
if ((size == 0) || (size > UINT16_MAX / 8))
goto init_failed;
{
const size_t size = get_rsa_key_size(ctx->privateKey);
if ((size == 0) || (size > UINT16_MAX / 8))
goto init_failed;
cmrec.wKeyExchangeKeySizeBits = (WORD)size * 8;
cmrec.wKeyExchangeKeySizeBits = (WORD)size * 8;
}
if (!vgids_ef_write_do(commonEF, VGIDS_DO_CMAPFILE, &cmrec, sizeof(cmrec)))
goto init_failed;