AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-23 01:49:53 +03:00
Code Releases Activity

Merge PR #888: Fixed the RsaVerifyEx function buffer overflow problem

Browse Source
This commit is contained in:
Davide Beatrici 2019-03-06 17:43:37 +01:00 committed by GitHub
commit ec7a0512f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mayaqua/Encrypt.c
View File

@ -2197,7 +2197,9 @@ bool RsaVerify(void *data, UINT data_size, void *sign, K *k)
bool RsaVerifyEx(void *data, UINT data_size, void *sign, K *k, UINT bits) bool RsaVerifyEx(void *data, UINT data_size, void *sign, K *k, UINT bits)
{ {
UCHAR hash_data[SIGN_HASH_SIZE]; UCHAR hash_data[SIGN_HASH_SIZE];
UCHAR decrypt_data[SIGN_HASH_SIZE]; UCHAR *decrypt_data;
RSA *rsa;
UINT rsa_size;
// Validate arguments // Validate arguments
if (data == NULL || sign == NULL || k == NULL || k->private_key != false) if (data == NULL || sign == NULL || k == NULL || k->private_key != false)
{ {
@ -2208,24 +2210,38 @@ bool RsaVerifyEx(void *data, UINT data_size, void *sign, K *k, UINT bits)
bits = RSA_KEY_SIZE; bits = RSA_KEY_SIZE;
} }
rsa = EVP_PKEY_get0_RSA(k->pkey);
if (rsa == NULL)
{
return false;
}
// Hash the data // Hash the data
if (HashForSign(hash_data, sizeof(hash_data), data, data_size) == false) if (HashForSign(hash_data, sizeof(hash_data), data, data_size) == false)
{ {
return false; return false;
} }
rsa_size = RSA_size(rsa);
rsa_size = MAX(rsa_size, 1024); // For just in case
decrypt_data = ZeroMalloc(rsa_size);
// Decode the signature // Decode the signature
if (RSA_public_decrypt(bits / 8, sign, decrypt_data, EVP_PKEY_get0_RSA(k->pkey), RSA_PKCS1_PADDING) <= 0) if (RSA_public_decrypt(bits / 8, sign, decrypt_data, rsa, RSA_PKCS1_PADDING) <= 0)
{ {
Free(decrypt_data);
return false; return false;
} }
// Comparison // Comparison
if (Cmp(decrypt_data, hash_data, SIGN_HASH_SIZE) != 0) if (Cmp(decrypt_data, hash_data, SIGN_HASH_SIZE) != 0)
{ {
Free(decrypt_data);
return false; return false;
} }
Free(decrypt_data);
return true; return true;
} }