wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5257 from SparkiDev/i2d_RSA_fix

Browse Source 
i2d AIPs move pointer on when a pointer to a buffer is passed in
This commit is contained in:
David Garske
2022-06-16 21:44:23 -07:00
committed by GitHub
parent 66775d90d4 6a0682d422
commit 2f6b5a97a4
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pk.c
View File

@ -861,7 +861,7 @@ int wolfSSL_i2d_RSAPrivateKey(WOLFSSL_RSA *rsa, unsigned char **pp)
} }
/* Encode the RSA key as a DER. Call allocates buffer into pp. /* Encode the RSA key as a DER. Call allocates buffer into pp.
* No heap hint as this gets returned to the user */ * No heap hint as this gets returned to the user */
else if ((ret = wolfSSL_RSA_To_Der(rsa, pp, 0, NULL)) < 0) { else if ((ret = wolfSSL_RSA_To_Der_ex(rsa, pp, 0, NULL)) < 0) {
WOLFSSL_MSG("wolfSSL_RSA_To_Der failed"); WOLFSSL_MSG("wolfSSL_RSA_To_Der failed");
ret = 0; ret = 0;
} }
@ -898,7 +898,7 @@ int wolfSSL_i2d_RSAPublicKey(WOLFSSL_RSA *rsa, unsigned char **pp)
} }
/* Encode the RSA key as a DER. Call allocates buffer into pp. /* Encode the RSA key as a DER. Call allocates buffer into pp.
* No heap hint as this gets returned to the user */ * No heap hint as this gets returned to the user */
else if ((ret = wolfSSL_RSA_To_Der(rsa, pp, 1, NULL)) < 0) { else if ((ret = wolfSSL_RSA_To_Der_ex(rsa, pp, 1, NULL)) < 0) {
WOLFSSL_MSG("wolfSSL_RSA_To_Der failed"); WOLFSSL_MSG("wolfSSL_RSA_To_Der failed");
ret = 0; ret = 0;
} }

9
tests/api.c
View File

@ -40455,11 +40455,15 @@ static void test_wolfSSL_d2i_PrivateKeys_bio(void)
AssertIntEQ(wolfSSL_i2d_RSAPrivateKey(rsa, NULL), 1192); AssertIntEQ(wolfSSL_i2d_RSAPrivateKey(rsa, NULL), 1192);
AssertIntEQ(wolfSSL_i2d_RSAPrivateKey(rsa, &bufPtr), AssertIntEQ(wolfSSL_i2d_RSAPrivateKey(rsa, &bufPtr),
sizeof_client_key_der_2048); sizeof_client_key_der_2048);
AssertStrEQ((const char*)bufPtr, (const char*)client_key_der_2048); bufPtr -= sizeof_client_key_der_2048;
AssertIntEQ(XMEMCMP(bufPtr, client_key_der_2048,
sizeof_client_key_der_2048), 0);
bufPtr = NULL; bufPtr = NULL;
AssertIntEQ(wolfSSL_i2d_RSAPrivateKey(rsa, &bufPtr), AssertIntEQ(wolfSSL_i2d_RSAPrivateKey(rsa, &bufPtr),
sizeof_client_key_der_2048); sizeof_client_key_der_2048);
AssertNotNull(bufPtr); AssertNotNull(bufPtr);
AssertIntEQ(XMEMCMP(bufPtr, client_key_der_2048,
sizeof_client_key_der_2048), 0);
XFREE(bufPtr, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(bufPtr, NULL, DYNAMIC_TYPE_OPENSSL);
RSA_free(rsa); RSA_free(rsa);
@ -51619,8 +51623,7 @@ static void test_wolfSSL_RSA_DER(void)
newBuff = NULL; newBuff = NULL;
AssertIntEQ(i2d_RSAPublicKey(rsa, &newBuff), pub[i].sz); AssertIntEQ(i2d_RSAPublicKey(rsa, &newBuff), pub[i].sz);
AssertNotNull(newBuff); AssertNotNull(newBuff);
AssertStrEQ((const char*)newBuff, (const char*)pub[i].der); AssertIntEQ(XMEMCMP((void *)newBuff, (void *)pub[i].der, pub[i].sz), 0);
AssertIntEQ(0, memcmp((void *)newBuff, (void *)pub[i].der, pub[i].sz));
XFREE((void *)newBuff, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE((void *)newBuff, NULL, DYNAMIC_TYPE_TMP_BUFFER);
RSA_free(rsa); RSA_free(rsa);
} }