feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5255 from lealem47/i2d_RSA

Browse Source 
Call RSA_To_Der instead of RSA_To_Der_ex in i2dd_RSA key funcs
This commit is contained in:
David Garske
2022-06-16 14:43:58 -07:00
committed by GitHub
parent 1322c1a0b2 911f361285
commit f2abf1892c
2 changed files with 4 additions and 2 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_ex(rsa, pp, 0, NULL)) < 0) { else if ((ret = wolfSSL_RSA_To_Der(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_ex(rsa, pp, 1, NULL)) < 0) { else if ((ret = wolfSSL_RSA_To_Der(rsa, pp, 1, NULL)) < 0) {
WOLFSSL_MSG("wolfSSL_RSA_To_Der failed"); WOLFSSL_MSG("wolfSSL_RSA_To_Der failed");
ret = 0; ret = 0;
} }

2
tests/api.c
View File

@@ -40408,6 +40408,7 @@ 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 = 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);
@@ -51571,6 +51572,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(0, memcmp((void *)newBuff, (void *)pub[i].der, pub[i].sz)); 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);