Addressed review comments

Author: miyazakh

src/sign-verify/clu_sign.c

@@ -280,7 +280,9 @@ int wolfCLU_sign_data_rsa(byte* data, char* out, word32 dataSz, char* privKey,
                 ret = BAD_FUNC_ARG;
             }
             else {
-                XFWRITE(outBuf, 1, outBufSz, s);
+                if ((int)XFWRITE(outBuf, 1, outBufSz, s) <= 0) {
+                    ret = OUTPUT_FILE_ERROR;
+                }
                 XFCLOSE(s);
             }
         }
@@ -455,7 +457,9 @@ int wolfCLU_sign_data_ecc(byte* data, char* out, word32 fSz, char* privKey,
                 ret = BAD_FUNC_ARG;
             }
             else {
-                XFWRITE(outBuf, 1, outLen, s);
+                if ((int)XFWRITE(outBuf, 1, outLen, s) <= 0) {
+                    ret = OUTPUT_FILE_ERROR;
+                }
                 XFCLOSE(s);
             }
         }
@@ -618,7 +622,9 @@ int wolfCLU_sign_data_ed25519 (byte* data, char* out, word32 fSz, char* privKey,
                 ret = BAD_FUNC_ARG;
             }
             else {
-                XFWRITE(outBuf, 1, outLen, s);
+                if ((int)XFWRITE(outBuf, 1, outLen, s) <= 0) {
+                    ret = OUTPUT_FILE_ERROR;
+                }
                 XFCLOSE(s);
             }
         }
@@ -734,7 +740,7 @@ int wolfCLU_sign_data_dilithium (byte* data, char* out, word32 dataSz, char* pri
         privBufSz = privFileSz;
         if (XFSEEK(privKeyFile, 0, SEEK_SET) != 0 ||
             (int)XFREAD(privBuf, 1, privFileSz, privKeyFile) != privFileSz) {
-            wolfCLU_LogError("Incorrect private key file size: %d", privFileSz);
+            wolfCLU_LogError("Failed to read private key file.");
             ret = WOLFCLU_FATAL_ERROR;
         }
     }
@@ -788,7 +794,9 @@ int wolfCLU_sign_data_dilithium (byte* data, char* out, word32 dataSz, char* pri
             wolfCLU_LogError("Failed to open output file %s", out);
             ret = BAD_FUNC_ARG;
         } else {
-            XFWRITE(outBuf, 1, outBufSz, outFile);
+            if ((int)XFWRITE(outBuf, 1, outBufSz, outFile) <= 0) {
+                ret = OUTPUT_FILE_ERROR;
+            }
             XFCLOSE(outFile);
         }
     }

src/sign-verify/clu_verify.c

@@ -450,13 +450,16 @@ int wolfCLU_verify_signature_rsa(byte* sig, char* out, int sigSz, char* keyPath,
 
         /* write the output to the specified file */
         if (ret > 0) {
+            int writeSz = ret;
             XFILE s = XFOPEN(out, "wb");
             if (s == NULL) {
                 wolfCLU_LogError("Unable to open file %s", out);
                 ret = BAD_FUNC_ARG;
             }
             else {
-                XFWRITE(outBuf, 1, ret, s);
+                if ((int)XFWRITE(outBuf, 1, writeSz, s) <= 0) {
+                    ret = OUTPUT_FILE_ERROR;
+                }
                 XFCLOSE(s);
             }
         }
@@ -814,7 +817,7 @@ int wolfCLU_verify_signature_dilithium(byte* sig, int sigSz, byte* msg,
     /* open and read public key */
     keyFile = XFOPEN(keyPath, "rb");
     if (keyFile == NULL) {
-        wolfCLU_LogError("Failed to open Private key FILE.");
+        wolfCLU_LogError("Failed to open public key FILE.");
         wc_dilithium_free(key);
     #ifdef WOLFSSL_SMALL_STACK
         XFREE(key, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);

tests/genkey_sign_ver/genkey-sign-ver-test.py

@@ -356,8 +356,8 @@ def test_sign_corrupted_key_fails(self):
         corrupt_key = "mldsakey_corrupt.priv"
         bad_sig = "mldsa_bad_corrupt.sig"
         self._track(corrupt_key, bad_sig)
-        with open(corrupt_key, "w") as f:
-            f.write("INVALID KEY DATA")
+        with open(corrupt_key, "wb") as f:
+            f.write(b"INVALID KEY DATA")
         r = run_wolfssl("-dilithium", "-sign", "-inkey", corrupt_key,
                         "-inform", "der", "-in", self.SIGN_FILE,
                         "-out", bad_sig)