fix issue where ToTraditional_ex may assign negative value to *pkeySz

rlm2002 · rlm2002 · commit 3137d62cf318 · 2026-05-01T14:06:51.000-06:00
diff --git a/wolfcrypt/src/pkcs12.c b/wolfcrypt/src/pkcs12.c
@@ -1562,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;
                         }
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -1562,8 +1562,13 @@ int wc_PKCS12_parse_ex(WC_PKCS12* pkcs12, const char* psw,`
`1562`	`1562`	`*pkeySz = (word32)size;`
`1563`	`1563`	`}`
`1564`	`1564`	`else {`
`1565`		`- pkeySz = (word32)ToTraditional_ex(pkey,`
`1566`		`- (word32)size, &algId);`
	`1565`	`+ ret = ToTraditional_ex(*pkey,`
	`1566`	`+ (word32)size, &algId);`
	`1567`	`+ if (ret < 0) {`
	`1568`	`+ *pkeySz = (word32)size;`
	`1569`	`+ goto exit_pk12par;`
	`1570`	`+ }`
	`1571`	`+ *pkeySz = (word32)ret;`
`1567`	`1572`	`}`
`1568`	`1573`	`}`
`1569`	`1574`