Merge pull request #599 from stenslae/fenrir/f6721-pkcs12-createkey-sign

F-6721 PKCS12 Fix
pull/602/head
JacobBarthelmeh 2026-07-15 15:42:00 -06:00 committed by GitHub
commit 1d906c77c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 6 deletions

View File

@ -43,6 +43,7 @@ static int devId = INVALID_DEVID; /* set to alternate dev id if wanted */
static int createKey(byte** keyDer, word32* keySz, RsaKey* key, WC_RNG* rng)
{
int ret;
int derSz;
*keyDer = NULL;
*keySz = 0;
@ -57,10 +58,13 @@ static int createKey(byte** keyDer, word32* keySz, RsaKey* key, WC_RNG* rng)
}
if (ret == 0) {
*keySz = wc_RsaKeyToDer(key, NULL, 0);
if (*keySz < 0) {
derSz = wc_RsaKeyToDer(key, NULL, 0);
if (derSz < 0) {
printf("unable to convert RSA key to DER\n");
ret = *keySz;
ret = derSz;
}
else {
*keySz = (word32)derSz;
}
}
@ -72,10 +76,13 @@ static int createKey(byte** keyDer, word32* keySz, RsaKey* key, WC_RNG* rng)
}
if (ret == 0) {
*keySz = wc_RsaKeyToDer(key, *keyDer, *keySz);
if (*keySz < 0) {
derSz = wc_RsaKeyToDer(key, *keyDer, *keySz);
if (derSz < 0) {
printf("unable to convert RSA key to DER\n");
ret = *keySz;
ret = derSz;
}
else {
*keySz = (word32)derSz;
}
}