First round of review

Author: julek-wolfssl

tests/dh/dh-test.py

@@ -67,7 +67,8 @@ def test_dhparam_noout(self):
         self.addCleanup(lambda: os.remove(params_file)
                         if os.path.exists(params_file) else None)
 
-        run_wolfssl("dhparam", "1024", "-out", params_file)
+        r = run_wolfssl("dhparam", "1024", "-out", params_file)
+        self.assertEqual(r.returncode, 0, r.stderr)
 
         r = run_wolfssl("dhparam", "-in", params_file, "-noout")
         self.assertEqual(r.returncode, 0, r.stderr)
@@ -78,7 +79,8 @@ def test_dhparam_genkey(self):
         self.addCleanup(lambda: os.remove(params_file)
                         if os.path.exists(params_file) else None)
 
-        run_wolfssl("dhparam", "1024", "-out", params_file)
+        r = run_wolfssl("dhparam", "1024", "-out", params_file)
+        self.assertEqual(r.returncode, 0, r.stderr)
 
         r = run_wolfssl("dhparam", "-in", params_file, "-genkey")
         self.assertEqual(r.returncode, 0, r.stderr)
@@ -90,7 +92,8 @@ def test_dhparam_genkey_noout(self):
         self.addCleanup(lambda: os.remove(params_file)
                         if os.path.exists(params_file) else None)
 
-        run_wolfssl("dhparam", "1024", "-out", params_file)
+        r = run_wolfssl("dhparam", "1024", "-out", params_file)
+        self.assertEqual(r.returncode, 0, r.stderr)
 
         r = run_wolfssl("dhparam", "-in", params_file, "-genkey", "-noout")
         self.assertEqual(r.returncode, 0, r.stderr)

tests/dsa/dsa-test.py

@@ -54,7 +54,8 @@ def test_dsaparam_noout(self):
         self.addCleanup(lambda: os.remove(params_file)
                         if os.path.exists(params_file) else None)
 
-        run_wolfssl("dsaparam", "-out", params_file, "1024")
+        r = run_wolfssl("dsaparam", "-out", params_file, "1024")
+        self.assertEqual(r.returncode, 0, r.stderr)
 
         r = run_wolfssl("dsaparam", "-in", params_file, "-noout")
         self.assertEqual(r.returncode, 0, r.stderr)
@@ -65,7 +66,8 @@ def test_dsaparam_genkey(self):
         self.addCleanup(lambda: os.remove(params_file)
                         if os.path.exists(params_file) else None)
 
-        run_wolfssl("dsaparam", "-out", params_file, "1024")
+        r = run_wolfssl("dsaparam", "-out", params_file, "1024")
+        self.assertEqual(r.returncode, 0, r.stderr)
 
         r = run_wolfssl("dsaparam", "-in", params_file, "-genkey")
         self.assertEqual(r.returncode, 0, r.stderr)
@@ -77,7 +79,8 @@ def test_dsaparam_genkey_noout(self):
         self.addCleanup(lambda: os.remove(params_file)
                         if os.path.exists(params_file) else None)
 
-        run_wolfssl("dsaparam", "-out", params_file, "1024")
+        r = run_wolfssl("dsaparam", "-out", params_file, "1024")
+        self.assertEqual(r.returncode, 0, r.stderr)
 
         r = run_wolfssl("dsaparam", "-in", params_file, "-genkey", "-noout")
         self.assertEqual(r.returncode, 0, r.stderr)

tests/encrypt/enc-test.py

@@ -152,9 +152,10 @@ def test_openssl_enc_wolfssl_dec(self):
         orig = os.path.join(CERTS_DIR, "crl.der")
         self._cleanup(enc, dec)
 
-        subprocess.run(["openssl", "enc", "-base64", "-aes-256-cbc",
-                         "-k", "test password", "-in", orig, "-out", enc],
-                        capture_output=True)
+        ossl = subprocess.run(["openssl", "enc", "-base64", "-aes-256-cbc",
+                                "-k", "test password", "-in", orig, "-out", enc],
+                               capture_output=True)
+        self.assertEqual(ossl.returncode, 0, ossl.stderr)
 
         r = run_enc("enc", "-base64", "-d", "-aes-256-cbc",
                      "-in", enc, "-out", dec, password="test password")
@@ -171,9 +172,10 @@ def test_wolfssl_enc_openssl_dec(self):
                      "-in", orig, "-out", enc, password="test password")
         self.assertEqual(r.returncode, 0, r.stderr)
 
-        subprocess.run(["openssl", "enc", "-base64", "-d", "-aes-256-cbc",
-                         "-k", "test password", "-in", enc, "-out", dec],
-                        capture_output=True)
+        ossl = subprocess.run(["openssl", "enc", "-base64", "-d", "-aes-256-cbc",
+                                "-k", "test password", "-in", enc, "-out", dec],
+                               capture_output=True)
+        self.assertEqual(ossl.returncode, 0, ossl.stderr)
         self.assertTrue(filecmp.cmp(orig, dec, shallow=False))
 
     def test_pbkdf2_openssl_enc_wolfssl_dec(self):
@@ -182,9 +184,10 @@ def test_pbkdf2_openssl_enc_wolfssl_dec(self):
         orig = os.path.join(CERTS_DIR, "crl.der")
         self._cleanup(enc, dec)
 
-        subprocess.run(["openssl", "enc", "-base64", "-pbkdf2", "-aes-256-cbc",
-                         "-k", "long test password", "-in", orig, "-out", enc],
-                        capture_output=True)
+        ossl = subprocess.run(["openssl", "enc", "-base64", "-pbkdf2", "-aes-256-cbc",
+                                "-k", "long test password", "-in", orig, "-out", enc],
+                               capture_output=True)
+        self.assertEqual(ossl.returncode, 0, ossl.stderr)
 
         r = run_enc("enc", "-base64", "-d", "-pbkdf2", "-aes-256-cbc",
                      "-in", enc, "-out", dec, password="long test password")
@@ -201,10 +204,11 @@ def test_pbkdf2_wolfssl_enc_openssl_dec(self):
                      "-in", orig, "-out", enc, password="long test password")
         self.assertEqual(r.returncode, 0, r.stderr)
 
-        subprocess.run(["openssl", "enc", "-base64", "-d", "-pbkdf2",
-                         "-aes-256-cbc", "-k", "long test password",
-                         "-in", enc, "-out", dec],
-                        capture_output=True)
+        ossl = subprocess.run(["openssl", "enc", "-base64", "-d", "-pbkdf2",
+                                "-aes-256-cbc", "-k", "long test password",
+                                "-in", enc, "-out", dec],
+                               capture_output=True)
+        self.assertEqual(ossl.returncode, 0, ossl.stderr)
         self.assertTrue(filecmp.cmp(orig, dec, shallow=False))
 
     def test_pbkdf2_wolfssl_pass_flag(self):

tests/wolfclu_test.py

@@ -32,13 +32,15 @@ def _find_wolfssl_bin():
 CERTS_DIR = os.path.join(".", "certs")
 
 
-def run_wolfssl(*args, stdin_data=None):
+def run_wolfssl(*args, stdin_data=None, timeout=60):
     """Run the wolfssl binary with the given arguments.
 
     Returns a CompletedProcess instance.
+    A default timeout of 60 seconds prevents indefinite hangs in CI.
+    Network-facing tests (s_client, ocsp) manage their own timeouts.
     """
     cmd = [WOLFSSL_BIN] + list(args)
-    kwargs = dict(capture_output=True, text=True)
+    kwargs = dict(capture_output=True, text=True, timeout=timeout)
     if stdin_data is not None:
         kwargs["input"] = stdin_data
     else:

tests/x509/CRL-verify-test.py

@@ -1,11 +1,12 @@
+#!/usr/bin/env python3
 """Tests for wolfssl crl (converted from CRL-verify-test.sh)."""
 
 import os
 import sys
 import unittest
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
-from wolfclu_test import WOLFSSL_BIN, CERTS_DIR, run_wolfssl
+from wolfclu_test import CERTS_DIR, run_wolfssl
 
 
 def _has_crl():

tests/x509/x509-ca-test.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """Tests for wolfssl ca (converted from x509-ca-test.sh)."""
 
 import os

tests/x509/x509-process-test.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """Tests for wolfssl x509 processing (converted from x509-process-test.sh)."""
 
 import os

tests/x509/x509-req-test.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """Tests for wolfssl req and x509 -req (converted from x509-req-test.sh)."""
 
 import os

tests/x509/x509-verify-test.py

@@ -1,11 +1,12 @@
+#!/usr/bin/env python3
 """Tests for wolfssl verify (converted from x509-verify-test.sh)."""
 
 import os
 import sys
 import unittest
 
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
-from wolfclu_test import WOLFSSL_BIN, CERTS_DIR, run_wolfssl
+from wolfclu_test import CERTS_DIR, run_wolfssl
 
 
 def _has_crl():