fixes

Signed-off-by: Sameeh Jubran <sameeh@wolfssl.com>

Author: sameehj

doc/dox_comments/header_files/cryptocb.h

@@ -54,14 +54,13 @@
         #endif
         #if defined(WC_RSA_PSS) && !defined(NO_RSA)
             if (info->pk.type == WC_PK_TYPE_RSA_PSS) {
-                /* RSA-PSS sign/verify (e.g. PKCS#7 SignedData, X.509).
-                 * Uses info->pk.rsa (in/inLen = digest, out/outLen = signature,
-                 * key, rng). With WOLF_CRYPTO_CB_RSA_PAD, info->pk.rsa.padding
-                 * supplies hash and salt length. */
-                ret = wc_RsaFunction(info->pk.rsa.in, info->pk.rsa.inLen,
-                    info->pk.rsa.out, info->pk.rsa.outLen, info->pk.rsa.type,
+                // RSA-PSS sign/verify
+                ret = wc_RsaPSS_Sign_ex(
+                    info->pk.rsa.in, info->pk.rsa.inLen,
+                    info->pk.rsa.out, *info->pk.rsa.outLen,
+                    WC_HASH_TYPE_SHA256, WC_MGF1SHA256,
+                    RSA_PSS_SALT_LEN_DEFAULT,
                     info->pk.rsa.key, info->pk.rsa.rng);
-                break;
             }
         #endif
         #ifdef HAVE_ECC

tests/api/test_pkcs7.c

@@ -975,19 +975,20 @@ int test_wc_PKCS7_EncodeSignedData_RSA_PSS(void)
 
     ExpectIntEQ(wc_InitRng(&rng), 0);
     ExpectNotNull(pkcs7 = wc_PKCS7_New(HEAP_HINT, testDevId));
-    ExpectIntEQ(wc_PKCS7_Init(pkcs7, HEAP_HINT, INVALID_DEVID), 0);
 
     ExpectTrue((fp = XFOPEN("./certs/rsapss/client-rsapss.der", "rb")) != XBADFILE);
-    ExpectIntGT(certSz = (word32)XFREAD(cert, 1, sizeof(cert), fp), 0);
     if (fp != XBADFILE) {
+        ExpectIntGT(certSz = (word32)XFREAD(cert, 1, sizeof(cert), fp), 0);
         XFCLOSE(fp);
         fp = XBADFILE;
     }
 
     ExpectTrue((fp = XFOPEN("./certs/rsapss/client-rsapss-priv.der", "rb")) != XBADFILE);
-    ExpectIntGT(keySz = (word32)XFREAD(key, 1, sizeof(key), fp), 0);
-    if (fp != XBADFILE)
+    if (fp != XBADFILE) {
+        ExpectIntGT(keySz = (word32)XFREAD(key, 1, sizeof(key), fp), 0);
         XFCLOSE(fp);
+        fp = XBADFILE;
+    }
 
     ExpectIntEQ(wc_PKCS7_InitWithCert(pkcs7, cert, certSz), 0);