Skip to content

Various PKCS12 Fixes #10378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rlm2002 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Various PKCS12 Fixes #10378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ff02a7
Zero byte array buffer before free
rlm2002 Apr 30, 2026
1bf33bc
PKCS12 and unicode password size check improvement
rlm2002 Apr 30, 2026
3a799bd
zeroize unicodePasswd before breaking
rlm2002 May 1, 2026
c2d44b4
Bound by curSz in PKCS12 ContentInfo parsing
rlm2002 May 1, 2026
001939d
Call ForceZero on sensitive buffers
rlm2002 May 1, 2026
00e1fa6
Adds tmpSz so int is not cast to word32 in wc_d2i_PKCS12
rlm2002 May 1, 2026
3137d62
fix issue where ToTraditional_ex may assign negative value to *pkeySz
rlm2002 May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions wolfcrypt/src/pkcs12.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ static int GetSafeContent(WC_PKCS12* pkcs12, const byte* input,

curIdx = localIdx;
if ((ret = GetObjectId(input, &localIdx, &oid, oidIgnoreType,
(word32)size)) < 0) {
curIdx + (word32)curSz)) < 0) {
WOLFSSL_LEAVE("Get object id failed", ret);
freeSafe(safe, pkcs12->heap);
return ret;
Expand Down Expand Up @@ -558,7 +558,8 @@ static int wc_PKCS12_create_mac(WC_PKCS12* pkcs12, byte* data, word32 dataSz,
return MEMORY_E; });

/* unicode set up from asn.c */
if ((pswSz * 2 + 2) > MAX_UNICODE_SZ) {
if (pswSz >= MAX_UNICODE_SZ ||
(pswSz * 2 + 2) > MAX_UNICODE_SZ) {
WOLFSSL_MSG("PKCS12 max unicode size too small");
ret = UNICODE_SIZE_E;
goto exit_mac;
Expand Down Expand Up @@ -695,6 +696,9 @@ int wc_d2i_PKCS12(const byte* der, word32 derSz, WC_PKCS12* pkcs12)
int ret;
int size = 0;
int version = 0;
#ifdef ASN_BER_TO_DER
word32 tmpSz = 0;
#endif

WOLFSSL_ENTER("wolfSSL_d2i_PKCS12");

Expand All @@ -716,22 +720,22 @@ int wc_d2i_PKCS12(const byte* der, word32 derSz, WC_PKCS12* pkcs12)
#ifdef ASN_BER_TO_DER
if (size == 0) {
if (wc_BerToDer(der, totalSz, NULL,
(word32*)&size) != WC_NO_ERR_TRACE(LENGTH_ONLY_E)) {
&tmpSz) != WC_NO_ERR_TRACE(LENGTH_ONLY_E)) {
WOLFSSL_MSG("Not BER sequence");
return ASN_PARSE_E;
}

pkcs12->der = (byte*)XMALLOC((size_t)size, pkcs12->heap, DYNAMIC_TYPE_PKCS);
pkcs12->der = (byte*)XMALLOC((size_t)tmpSz, pkcs12->heap, DYNAMIC_TYPE_PKCS);
if (pkcs12->der == NULL)
return MEMORY_E;
ret = wc_BerToDer(der, derSz, pkcs12->der, (word32*)&size);
ret = wc_BerToDer(der, derSz, pkcs12->der, &tmpSz);
if (ret < 0) {
return ret;
}

der = pkcs12->der;
pkcs12->derSz = (word32)size;
totalSz = (word32)size;
pkcs12->derSz = tmpSz;
totalSz = tmpSz;
idx = 0;

if (GetSequence(der, &idx, &size, totalSz) < 0) {
Expand Down Expand Up @@ -1558,8 +1562,13 @@ int wc_PKCS12_parse_ex(WC_PKCS12* pkcs12, const char* psw,
*pkeySz = (word32)size;
}
else {
*pkeySz = (word32)ToTraditional_ex(*pkey,
(word32)size, &algId);
ret = ToTraditional_ex(*pkey,
(word32)size, &algId);
if (ret < 0) {
*pkeySz = (word32)size;
goto exit_pk12par;
}
*pkeySz = (word32)ret;
}
}

Expand Down Expand Up @@ -1602,13 +1611,15 @@ int wc_PKCS12_parse_ex(WC_PKCS12* pkcs12, const char* psw,
if (keepKeyHeader) {
if ((ret = wc_DecryptPKCS8Key(k, (word32)size, psw,
pswSz)) < 0) {
ForceZero(k, (size_t)size);
XFREE(k, pkcs12->heap, DYNAMIC_TYPE_PUBLIC_KEY);
goto exit_pk12par;
}
}
else {
if ((ret = ToTraditionalEnc(k, (word32)size, psw,
pswSz, &algId)) < 0) {
ForceZero(k, (size_t)size);
XFREE(k, pkcs12->heap, DYNAMIC_TYPE_PUBLIC_KEY);
goto exit_pk12par;
}
Expand All @@ -1619,10 +1630,12 @@ int wc_PKCS12_parse_ex(WC_PKCS12* pkcs12, const char* psw,
byte* tmp = (byte*)XMALLOC((size_t)ret, pkcs12->heap,
DYNAMIC_TYPE_PUBLIC_KEY);
if (tmp == NULL) {
ForceZero(k, (size_t)size);
XFREE(k, pkcs12->heap, DYNAMIC_TYPE_PUBLIC_KEY);
ERROR_OUT(MEMORY_E, exit_pk12par);
}
XMEMCPY(tmp, k, (size_t)ret);
ForceZero(k, (size_t)size);
XFREE(k, pkcs12->heap, DYNAMIC_TYPE_PUBLIC_KEY);
k = tmp;
}
Expand All @@ -1633,6 +1646,7 @@ int wc_PKCS12_parse_ex(WC_PKCS12* pkcs12, const char* psw,
*pkeySz = (word32)size;
}
else { /* only expecting one key */
ForceZero(k, (size_t)size);
XFREE(k, pkcs12->heap, DYNAMIC_TYPE_PUBLIC_KEY);
}
idx += (word32)size;
Expand Down Expand Up @@ -1798,6 +1812,7 @@ int wc_PKCS12_parse_ex(WC_PKCS12* pkcs12, const char* psw,
if (ret != 0) {
/* failure cleanup */
if (*pkey) {
ForceZero(*pkey, *pkeySz);
XFREE(*pkey, pkcs12->heap, DYNAMIC_TYPE_PUBLIC_KEY);
*pkey = NULL;
}
Expand Down
6 changes: 6 additions & 0 deletions wolfcrypt/src/pwdbased.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,13 +550,19 @@ int wc_PKCS12_PBKDF_ex(byte* output, const byte* passwd, int passLen,
#ifdef WOLFSSL_SMALL_STACK
out:

ForceZero(Ai, WC_MAX_DIGEST_SIZE);
XFREE(Ai, heap, DYNAMIC_TYPE_TMP_BUFFER);
ForceZero(B, WC_MAX_BLOCK_SIZE);
XFREE(B, heap, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(B1, heap, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(i1, heap, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(res, heap, DYNAMIC_TYPE_TMP_BUFFER);
#else
ForceZero(Ai, WC_MAX_DIGEST_SIZE);
ForceZero(B, WC_MAX_BLOCK_SIZE);
#endif

ForceZero(buffer, totalLen);
if (dynamic)
XFREE(buffer, heap, DYNAMIC_TYPE_KEY);

Expand Down
13 changes: 10 additions & 3 deletions wolfcrypt/src/wc_encrypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,9 @@ int wc_CryptKey(const char* password, int passwordSz, const byte* salt,
int i, idx = 0;
byte unicodePasswd[MAX_UNICODE_SZ];

if ( (passwordSz * 2 + 2) > (int)sizeof(unicodePasswd)) {
if (passwordSz < 0 ||
passwordSz >= (int)sizeof(unicodePasswd) ||
(passwordSz * 2 + 2) > (int)sizeof(unicodePasswd)) {
ret = UNICODE_SIZE_E;
break;
}
Expand All @@ -482,16 +484,21 @@ int wc_CryptKey(const char* password, int passwordSz, const byte* salt,

ret = wc_PKCS12_PBKDF(key, unicodePasswd, idx, salt, saltSz,
iterations, (int)derivedLen, typeH, 1);
if (ret < 0)
if (ret < 0) {
ForceZero(unicodePasswd, MAX_UNICODE_SZ);
break;
}
if (id != PBE_SHA1_RC4_128) {
i = ret;
ret = wc_PKCS12_PBKDF(cbcIv, unicodePasswd, idx, salt,
saltSz, iterations, 8, typeH, 2);
if (ret < 0)
if (ret < 0) {
ForceZero(unicodePasswd, MAX_UNICODE_SZ);
break;
}
ret += i;
}
ForceZero(unicodePasswd, MAX_UNICODE_SZ);
break;
}
#endif /* HAVE_PKCS12 */
Expand Down
Loading