mirrors/FreeRDP
0
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2024-11-30 05:17:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

[crypto] fix integer narrowing

Browse Source
This commit is contained in:
akallabeth 2024-09-25 05:35:51 +02:00
parent 46c1ae145c
commit 31570e31e1
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
4 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libfreerdp/crypto/crypto.c
View File

@ -94,12 +94,12 @@ static SSIZE_T crypto_rsa_common(const BYTE* input, size_t length, UINT32 key_le
if (!(y = BN_new()))
goto fail;
if (!BN_bin2bn(modulus_reverse, key_length, mod))
if (!BN_bin2bn(modulus_reverse, (int)key_length, mod))
goto fail;
if (!BN_bin2bn(exponent_reverse, exponent_size, exp))
if (!BN_bin2bn(exponent_reverse, (int)exponent_size, exp))
goto fail;
if (!BN_bin2bn(input_reverse, length, x))
if (!BN_bin2bn(input_reverse, (int)length, x))
goto fail;
if (BN_mod_exp(y, x, exp, mod, ctx) != 1)
goto fail;

11
libfreerdp/crypto/privatekey.c
View File

@ -125,7 +125,11 @@ static EVP_PKEY* evp_pkey_utils_from_pem(const char* data, size_t len, BOOL from
if (fromFile)
bio = BIO_new_file(data, "rb");
else
bio = BIO_new_mem_buf(data, len);
{
if (len > INT_MAX)
return NULL;
bio = BIO_new_mem_buf(data, (int)len);
}
if (!bio)
{
@ -426,7 +430,10 @@ BOOL freerdp_key_generate(rdpPrivateKey* key, size_t key_length)
if (EVP_PKEY_keygen_init(pctx) != 1)
goto fail;
if (EVP_PKEY_CTX_set_rsa_keygen_bits(pctx, key_length) != 1)
if (key_length > INT_MAX)
goto fail;
if (EVP_PKEY_CTX_set_rsa_keygen_bits(pctx, (int)key_length) != 1)
goto fail;
EVP_PKEY_free(key->evp);

35
libfreerdp/crypto/tls.c
View File

@ -240,16 +240,14 @@ static int bio_rdp_tls_read(BIO* bio, char* buf, int size)
static int bio_rdp_tls_puts(BIO* bio, const char* str)
{
size_t size = 0;
int status = 0;
if (!str)
return 0;
size = strlen(str);
const size_t size = strnlen(str, INT_MAX + 1UL);
if (size > INT_MAX)
return -1;
ERR_clear_error();
status = BIO_write(bio, str, size);
return status;
return BIO_write(bio, str, (int)size);
}
static int bio_rdp_tls_gets(BIO* bio, char* str, int size)
@ -262,7 +260,7 @@ static long bio_rdp_tls_ctrl(BIO* bio, int cmd, long num, void* ptr)
BIO* ssl_rbio = NULL;
BIO* ssl_wbio = NULL;
BIO* next_bio = NULL;
int status = -1;
long status = -1;
BIO_RDP_TLS* tls = (BIO_RDP_TLS*)BIO_get_data(bio);
if (!tls)
@ -1087,7 +1085,7 @@ TlsHandshakeResult freerdp_tls_accept_ex(rdpTls* tls, BIO* underlying, rdpSettin
{
WINPR_ASSERT(tls);
long options = 0;
int options = 0;
int status = 0;
/**
@ -1239,33 +1237,34 @@ BOOL freerdp_tls_send_alert(rdpTls* tls)
int freerdp_tls_write_all(rdpTls* tls, const BYTE* data, int length)
{
WINPR_ASSERT(tls);
int status = 0;
int offset = 0;
BIO* bio = tls->bio;
while (offset < length)
{
ERR_clear_error();
status = BIO_write(bio, &data[offset], length - offset);
const int rc = BIO_write(bio, &data[offset], length - offset);
if (status > 0)
{
offset += status;
}
if (rc < 0)
return rc;
if (rc > 0)
offset += rc;
else
{
if (!BIO_should_retry(bio))
return -1;
if (BIO_write_blocked(bio))
status = BIO_wait_write(bio, 100);
{
const long status = BIO_wait_write(bio, 100);
if (status < 0)
return -1;
}
else if (BIO_read_blocked(bio))
return -2; /* Abort write, there is data that must be read */
else
USleep(100);
if (status < 0)
return -1;
}
}

53
libfreerdp/crypto/x509_utils.c
View File

@ -616,11 +616,7 @@ out_free_issuer:
static BYTE* x509_utils_get_pem(const X509* xcert, const STACK_OF(X509) * chain, size_t* plength)
{
BIO* bio = NULL;
int status = 0;
int count = 0;
size_t offset = 0;
size_t length = 0;
BOOL rc = FALSE;
BYTE* pemCert = NULL;
@ -631,7 +627,7 @@ static BYTE* x509_utils_get_pem(const X509* xcert, const STACK_OF(X509) * chain,
* Don't manage certificates internally, leave it up entirely to the external client
* implementation
*/
bio = BIO_new(BIO_s_mem());
BIO* bio = BIO_new(BIO_s_mem());
if (!bio)
{
@ -640,7 +636,7 @@ static BYTE* x509_utils_get_pem(const X509* xcert, const STACK_OF(X509) * chain,
}
X509* wcert = WINPR_CAST_CONST_PTR_AWAY(xcert, X509*);
status = PEM_write_bio_X509(bio, wcert);
int status = PEM_write_bio_X509(bio, wcert);
if (status < 0)
{
@ -663,46 +659,42 @@ static BYTE* x509_utils_get_pem(const X509* xcert, const STACK_OF(X509) * chain,
}
}
offset = 0;
length = 2048;
const size_t blocksize = 2048;
size_t offset = 0;
size_t length = blocksize;
pemCert = (BYTE*)malloc(length + 1);
if (!pemCert)
if (!pemCert || (length > INT_MAX))
{
WLog_ERR(TAG, "error allocating pemCert");
goto fail;
}
ERR_clear_error();
status = BIO_read(bio, pemCert, length);
if (status < 0)
while (offset < length)
{
WLog_ERR(TAG, "failed to read certificate");
goto fail;
}
offset += (size_t)status;
while (offset >= length)
{
int new_len = 0;
BYTE* new_cert = NULL;
new_len = length * 2;
new_cert = (BYTE*)realloc(pemCert, new_len + 1);
size_t new_len = length + blocksize;
BYTE* new_cert = (BYTE*)realloc(pemCert, new_len + 1);
size_t diff = length - offset;
if (!new_cert)
goto fail;
length = new_len;
pemCert = new_cert;
ERR_clear_error();
status = BIO_read(bio, &pemCert[offset], length - offset);
if (diff > INT_MAX)
goto fail;
status = BIO_read(bio, &pemCert[offset], (int)diff);
if (status < 0)
break;
offset += status;
offset += (size_t)status;
if ((size_t)status < diff)
break;
}
if (status < 0)
@ -735,7 +727,12 @@ X509* x509_utils_from_pem(const char* data, size_t len, BOOL fromFile)
if (fromFile)
bio = BIO_new_file(data, "rb");
else
bio = BIO_new_mem_buf(data, len);
{
if (len > INT_MAX)
return NULL;
bio = BIO_new_mem_buf(data, (int)len);
}
if (!bio)
{