minor fixes

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

Author: sameehj

tests/api/test_pkcs7.c

@@ -1014,6 +1014,14 @@ int test_wc_PKCS7_EncodeSignedData_RSA_PSS(void)
         if (outLen > 0) {
             int verifyRet = wc_PKCS7_VerifySignedData(pkcs7, output, (word32)outLen);
             ExpectIntEQ(verifyRet, 0);
+
+            /* Verify decoded RSASSA-PSS parameters match what we encoded:
+             *   hashAlgorithm  = SHA-256
+             *   maskGenAlgorithm = MGF1-SHA-256
+             *   saltLength     = 32 (== SHA-256 digest length) */
+            ExpectIntEQ(pkcs7->pssHashType, (int)WC_HASH_TYPE_SHA256);
+            ExpectIntEQ(pkcs7->pssMgf, WC_MGF1SHA256);
+            ExpectIntEQ(pkcs7->pssSaltLen, 32);
         }
     }
 

wolfcrypt/src/pkcs7.c

@@ -2105,7 +2105,11 @@ static int wc_PKCS7_RsaPssSign(wc_PKCS7* pkcs7, byte* digest, word32 digestSz,
             if (ret >= 0)
 #endif
             {
-                /* Use same saltLen as encoded in SignerInfo.signatureAlgorithm */
+                /* Salt length policy: use hash digest length (RFC 4055 typical).
+                 * RFC 3447 allows arbitrary salt lengths, but hash-length is the
+                 * most interoperable choice and matches OpenSSL's default.
+                 * Must agree with the saltLen encoded in
+                 * SignerInfo.signatureAlgorithm params above. */
                 int saltLen = wc_HashGetDigestSize(wc_OidGetHash(pkcs7->hashOID));
                 if (saltLen < 0) {
                     ret = saltLen;
@@ -3183,6 +3187,11 @@ static int PKCS7_EncodeSigned(wc_PKCS7* pkcs7,
         }
 #if defined(WC_RSA_PSS)
         if (digEncAlgoId == CTC_RSASSAPSS) {
+            /* Salt length policy: always encode as hash digest length.
+             * This is the common CMS/RFC 4055 profile and matches OpenSSL
+             * defaults.  The decoder (pssSaltLen) handles arbitrary values
+             * from external blobs.  A future pkcs7->pssSaltLen override for
+             * encode could be added here if custom salt lengths are needed. */
             int saltLen = wc_HashGetDigestSize(wc_OidGetHash(pkcs7->hashOID));
             if (saltLen < 0) {
                 idx = saltLen;