Fix rsa_pss_calc_salt not used with opensslextra=x509small.

dgarske · dgarske · commit 23259723125b · 2025-07-11T08:35:00.000-07:00
diff --git a/src/pk.c b/src/pk.c
@@ -3528,7 +3528,7 @@ int wolfSSL_RSA_generate_key_ex(WOLFSSL_RSA* rsa, int bits, WOLFSSL_BIGNUM* e,
 
 #ifdef WC_RSA_PSS
 
-#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
+#ifdef OPENSSL_EXTRA
 static int rsa_pss_calc_salt(int saltLen, int hashLen, int emLen)
 {
     /* Calculate the salt length to use for special cases. */
@@ -3555,7 +3555,7 @@ static int rsa_pss_calc_salt(int saltLen, int hashLen, int emLen)
     }
     return saltLen;
 }
-#endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */
+#endif /* OPENSSL_EXTRA */
 
 #if (defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO) || \
      defined(WOLFSSL_HAPROXY) || defined(WOLFSSL_NGINX)) && \

Original file line number	Diff line number	Diff line change
`@@ -3528,7 +3528,7 @@ int wolfSSL_RSA_generate_key_ex(WOLFSSL_RSA* rsa, int bits, WOLFSSL_BIGNUM* e,`
`3528`	`3528`
`3529`	`3529`	`#ifdef WC_RSA_PSS`
`3530`	`3530`
`3531`		`-#if defined(OPENSSL_EXTRA) \|\| defined(OPENSSL_EXTRA_X509_SMALL)`
	`3531`	`+#ifdef OPENSSL_EXTRA`
`3532`	`3532`	`static int rsa_pss_calc_salt(int saltLen, int hashLen, int emLen)`
`3533`	`3533`	`{`
`3534`	`3534`	`/* Calculate the salt length to use for special cases. */`
`@@ -3555,7 +3555,7 @@ static int rsa_pss_calc_salt(int saltLen, int hashLen, int emLen)`
`3555`	`3555`	`}`
`3556`	`3556`	`return saltLen;`
`3557`	`3557`	`}`
`3558`		`-#endif /* OPENSSL_EXTRA \|\| OPENSSL_EXTRA_X509_SMALL */`
	`3558`	`+#endif /* OPENSSL_EXTRA */`
`3559`	`3559`
`3560`	`3560`	`#if (defined(OPENSSL_ALL) \|\| defined(WOLFSSL_ASIO) \|\| \`
`3561`	`3561`	`defined(WOLFSSL_HAPROXY) \|\| defined(WOLFSSL_NGINX)) && \`