From d57d6d2b785e9e988e7c5235412d27b461f6567f Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Thu, 23 Mar 2023 15:00:53 -0400
Subject: [PATCH] Fix for variable server startup time

---
 scripts/ocsp-stapling.test  | 10 +++++++++-
 scripts/ocsp-stapling2.test | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/scripts/ocsp-stapling.test b/scripts/ocsp-stapling.test
index 7c295a0e2..29ebd80bf 100755
--- a/scripts/ocsp-stapling.test
+++ b/scripts/ocsp-stapling.test
@@ -401,7 +401,15 @@ generate_port() {
 generate_port
 openssl s_server $V4V6_FLAG -cert ./certs/server-cert.pem -key certs/server-key.pem -www -port $port &
 openssl_pid=$!
-sleep 0.1
+MAX_TIMEOUT=10
+until nc -z localhost $port # Wait for openssl to be ready
+do
+    sleep 0.05
+    if [ "$MAX_TIMEOUT" == "0" ]; then
+        break
+    fi
+    ((MAX_TIMEOUT--))
+done
 
 printf '%s\n\n' "------------- TEST CASE 6 SHOULD PASS ----------------------"
 # client asks for OCSP staple but doesn't fail when none returned
diff --git a/scripts/ocsp-stapling2.test b/scripts/ocsp-stapling2.test
index 61f9bc763..d7923dc51 100755
--- a/scripts/ocsp-stapling2.test
+++ b/scripts/ocsp-stapling2.test
@@ -466,7 +466,15 @@ generate_port() {
 generate_port
 openssl s_server -cert ./certs/server-cert.pem -key certs/server-key.pem -www -port $port &
 openssl_pid=$!
-sleep 0.1
+MAX_TIMEOUT=10
+until nc -z localhost $port # Wait for openssl to be ready
+do
+    sleep 0.05
+    if [ "$MAX_TIMEOUT" == "0" ]; then
+        break
+    fi
+    ((MAX_TIMEOUT--))
+done
 
 printf '%s\n\n' "------------- TEST CASE 9 SHOULD PASS ----------------------"
 # client asks for OCSP staple but doesn't fail when none returned