fix NO_MALLOC guard in an error case

kojo1 · kojo1 · commit a9548b2f11c4 · 2023-09-22T10:05:21.000+09:00
diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c
@@ -1734,7 +1734,9 @@ static int RsaUnPad_PSS(byte *pkcsBlock, unsigned int pkcsBlockLen,
 
     if ((ret = RsaMGF(mgf, pkcsBlock + maskLen, (word32)hLen, tmp, (word32)maskLen,
                                                                   heap)) != 0) {
+        #if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_STATIC_MEMORY)
         XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);
+        #endif
         return ret;
     }
 
@@ -1748,7 +1750,9 @@ static int RsaUnPad_PSS(byte *pkcsBlock, unsigned int pkcsBlockLen,
             }
         }
         if (tmp[i] != (pkcsBlock[i] ^ 0x01)) {
+            #if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_STATIC_MEMORY)
             XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);
+            #endif
             WOLFSSL_MSG("RsaUnPad_PSS: Padding Error Match");
             return PSS_SALTLEN_RECOVER_E;
         }
@@ -1759,13 +1763,17 @@ static int RsaUnPad_PSS(byte *pkcsBlock, unsigned int pkcsBlockLen,
     {
         for (i = 0; i < maskLen - 1 - saltLen; i++) {
             if (tmp[i] != pkcsBlock[i]) {
+                #if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_STATIC_MEMORY)
                 XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);
+                #endif
                 WOLFSSL_MSG("RsaUnPad_PSS: Padding Error Match");
                 return PSS_SALTLEN_E;
             }
         }
         if (tmp[i] != (pkcsBlock[i] ^ 0x01)) {
+            #if !defined(WOLFSSL_NO_MALLOC) || defined(WOLFSSL_STATIC_MEMORY)
             XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);
+            #endif
             WOLFSSL_MSG("RsaUnPad_PSS: Padding Error End");
             return PSS_SALTLEN_E;
         }

Original file line number	Diff line number	Diff line change
`@@ -1734,7 +1734,9 @@ static int RsaUnPad_PSS(byte *pkcsBlock, unsigned int pkcsBlockLen,`
`1734`	`1734`
`1735`	`1735`	`if ((ret = RsaMGF(mgf, pkcsBlock + maskLen, (word32)hLen, tmp, (word32)maskLen,`
`1736`	`1736`	`heap)) != 0) {`
	`1737`	`+ #if !defined(WOLFSSL_NO_MALLOC) \|\| defined(WOLFSSL_STATIC_MEMORY)`
`1737`	`1738`	`XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);`
	`1739`	`+ #endif`
`1738`	`1740`	`return ret;`
`1739`	`1741`	`}`
`1740`	`1742`
`@@ -1748,7 +1750,9 @@ static int RsaUnPad_PSS(byte *pkcsBlock, unsigned int pkcsBlockLen,`
`1748`	`1750`	`}`
`1749`	`1751`	`}`
`1750`	`1752`	`if (tmp[i] != (pkcsBlock[i] ^ 0x01)) {`
	`1753`	`+ #if !defined(WOLFSSL_NO_MALLOC) \|\| defined(WOLFSSL_STATIC_MEMORY)`
`1751`	`1754`	`XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);`
	`1755`	`+ #endif`
`1752`	`1756`	`WOLFSSL_MSG("RsaUnPad_PSS: Padding Error Match");`
`1753`	`1757`	`return PSS_SALTLEN_RECOVER_E;`
`1754`	`1758`	`}`
`@@ -1759,13 +1763,17 @@ static int RsaUnPad_PSS(byte *pkcsBlock, unsigned int pkcsBlockLen,`
`1759`	`1763`	`{`
`1760`	`1764`	`for (i = 0; i < maskLen - 1 - saltLen; i++) {`
`1761`	`1765`	`if (tmp[i] != pkcsBlock[i]) {`
	`1766`	`+ #if !defined(WOLFSSL_NO_MALLOC) \|\| defined(WOLFSSL_STATIC_MEMORY)`
`1762`	`1767`	`XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);`
	`1768`	`+ #endif`
`1763`	`1769`	`WOLFSSL_MSG("RsaUnPad_PSS: Padding Error Match");`
`1764`	`1770`	`return PSS_SALTLEN_E;`
`1765`	`1771`	`}`
`1766`	`1772`	`}`
`1767`	`1773`	`if (tmp[i] != (pkcsBlock[i] ^ 0x01)) {`
	`1774`	`+ #if !defined(WOLFSSL_NO_MALLOC) \|\| defined(WOLFSSL_STATIC_MEMORY)`
`1768`	`1775`	`XFREE(tmp, heap, DYNAMIC_TYPE_RSA_BUFFER);`
	`1776`	`+ #endif`
`1769`	`1777`	`WOLFSSL_MSG("RsaUnPad_PSS: Padding Error End");`
`1770`	`1778`	`return PSS_SALTLEN_E;`
`1771`	`1779`	`}`