Address second round of review comments

- Fix decrypt lastLoopFlag to use payload size excluding salt+IV,
  preventing spurious EOF error when payload < MAX_LEN
- Handle WAIT_FAILED/WAIT_ABANDONED in Windows checkStdin()
- Catch TimeoutExpired in server-test.py cleanup, fall back to kill()
- Also exit 77 when all individual tests are skipped (not just class)
- Increase MAX_CLIENT_ARGS from 17 to 32 for worst-case arg expansion
- Remove trailing whitespace on #undef lines in clu_header_main.h

Author: julek-wolfssl

src/client/client.c

@@ -2101,8 +2101,8 @@ int checkStdin(void)
     }
     else {
         DWORD waitResult = WaitForSingleObject(stdinHandle, 0);
-        if (waitResult == WAIT_OBJECT_0) {
-            stop = 1; /* stdin has data or is closed */
+        if (waitResult != WAIT_TIMEOUT) {
+            stop = 1;
         }
     }
 #else

src/client/clu_client_setup.c

@@ -72,7 +72,7 @@ static const char sniFlag[]       = "-S";
 int myoptind = 0;
 char* myoptarg = NULL;
 
-#define MAX_CLIENT_ARGS 17
+#define MAX_CLIENT_ARGS 32
 
 /* return WOLFCLU_SUCCESS on success */
 static int _addClientArg(const char** args, const char* in, int* idx)

src/crypto/clu_decrypt.c

@@ -77,14 +77,13 @@ int wolfCLU_decrypt(int alg, char* mode, byte* pwdKey, byte* key, int size,
     length = (int)XFTELL(inFile);
     XFSEEK(inFile, 0, SEEK_SET);
 
-    /* if there is a remainder,
-     * round up else no round
-     */
-    if (length % MAX_LEN > 0) {
-        lastLoopFlag = (length/MAX_LEN) + 1;
+    /* Compute loop count from the encrypted payload size (excluding the
+     * salt and IV that are read separately before the loop). */
+    if ((length - saltAndIvSize) % MAX_LEN > 0) {
+        lastLoopFlag = ((length - saltAndIvSize) / MAX_LEN) + 1;
     }
     else {
-        lastLoopFlag =  length/MAX_LEN;
+        lastLoopFlag = (length - saltAndIvSize) / MAX_LEN;
     }
 
     input = (byte*) XMALLOC(MAX_LEN, HEAP_HINT, DYNAMIC_TYPE_TMP_BUFFER);

tests/server/server-test.py

@@ -63,7 +63,11 @@ def test_server_client(self):
                              f"s_client failed: {client.stderr}")
         finally:
             server.terminate()
-            server.wait(timeout=5)
+            try:
+                server.wait(timeout=5)
+            except subprocess.TimeoutExpired:
+                server.kill()
+                server.wait()
 
 
 if __name__ == "__main__":

tests/wolfclu_test.py

@@ -67,6 +67,6 @@ def test_main():
     result = prog.result
     if not result.wasSuccessful():
         sys.exit(1)
-    if result.testsRun == 0:
+    if result.testsRun == 0 or len(result.skipped) == result.testsRun:
         sys.exit(77)
     sys.exit(0)

wolfclu/clu_header_main.h

@@ -43,16 +43,16 @@ extern "C" {
 #endif
 #endif
 
-#undef CRL_REASON_UNSPECIFIED           
-#undef CRL_REASON_KEY_COMPROMISE        
-#undef CRL_REASON_CA_COMPROMISE         
-#undef CRL_REASON_AFFILIATION_CHANGED   
-#undef CRL_REASON_SUPERSEDED            
+#undef CRL_REASON_UNSPECIFIED
+#undef CRL_REASON_KEY_COMPROMISE
+#undef CRL_REASON_CA_COMPROMISE
+#undef CRL_REASON_AFFILIATION_CHANGED
+#undef CRL_REASON_SUPERSEDED
 #undef CRL_REASON_CESSATION_OF_OPERATION
-#undef CRL_REASON_CERTIFICATE_HOLD      
-#undef CRL_REASON_REMOVE_FROM_CRL       
-#undef CRL_REASON_PRIVILEGE_WITHDRAWN   
-#undef CRL_REASON_AA_COMPROMISE         
+#undef CRL_REASON_CERTIFICATE_HOLD
+#undef CRL_REASON_REMOVE_FROM_CRL
+#undef CRL_REASON_PRIVILEGE_WITHDRAWN
+#undef CRL_REASON_AA_COMPROMISE
 
 
 /* wolfssl includes */