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 #4265 from miyazakh/ecc_pubkey

Browse Source 
update der size in actual length
This commit is contained in:
Chris Conlon
2021-08-03 16:41:36 -06:00
committed by GitHub
parent b3c502890c 2b43052f36
commit d64768abff
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/api.c
View File

@ -28843,7 +28843,10 @@ static void test_wolfSSL_PEM_PUBKEY(void)
const char* fname = "./certs/ecc-client-keyPub.pem"; const char* fname = "./certs/ecc-client-keyPub.pem";
size_t sz; size_t sz;
byte* buf; byte* buf;
EVP_PKEY* pkey2;
EC_KEY* ec_key;
file = XFOPEN(fname, "rb"); file = XFOPEN(fname, "rb");
AssertTrue((file != XBADFILE)); AssertTrue((file != XBADFILE));
XFSEEK(file, 0, XSEEK_END); XFSEEK(file, 0, XSEEK_END);
@ -28860,6 +28863,19 @@ static void test_wolfSSL_PEM_PUBKEY(void)
XFREE(buf, NULL, DYNAMIC_TYPE_FILE); XFREE(buf, NULL, DYNAMIC_TYPE_FILE);
BIO_free(bio); BIO_free(bio);
bio = NULL; bio = NULL;
/* Qt unit test case*/
AssertNotNull(pkey2 = EVP_PKEY_new());
AssertNotNull(ec_key = EVP_PKEY_get1_EC_KEY(pkey));
AssertIntEQ(EVP_PKEY_set1_EC_KEY(pkey2, ec_key), WOLFSSL_SUCCESS);
#ifdef WOLFSSL_ERROR_CODE_OPENSSL
AssertIntEQ(EVP_PKEY_cmp(pkey, pkey2), 1/* match */);
#else
AssertIntEQ(EVP_PKEY_cmp(pkey, pkey2), 0);
#endif
EC_KEY_free(ec_key);
EVP_PKEY_free(pkey2);
EVP_PKEY_free(pkey); EVP_PKEY_free(pkey);
pkey = NULL; pkey = NULL;
} }

2
wolfcrypt/src/evp.c
View File

@ -6730,7 +6730,7 @@ static int ECC_populate_EVP_PKEY(EVP_PKEY* pkey, WOLFSSL_EC_KEY *key)
DYNAMIC_TYPE_OPENSSL); DYNAMIC_TYPE_OPENSSL);
if (derBuf != NULL) { if (derBuf != NULL) {
pkey->pkey.ptr = (char*)derBuf; pkey->pkey.ptr = (char*)derBuf;
if (wc_EccPublicKeyToDer(ecc, derBuf, derSz, 1) < 0) { if ((derSz = wc_EccPublicKeyToDer(ecc, derBuf, derSz, 1)) < 0) {
XFREE(derBuf, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(derBuf, NULL, DYNAMIC_TYPE_OPENSSL);
derBuf = NULL; derBuf = NULL;
} }