From e2a1ab9e49e60c2fd2d8c63d8059a85d0d639d44 Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Fri, 10 Mar 2023 15:35:03 -0500
Subject: [PATCH 1/2] Fix possible timing issue with other tests copying the
 certs folder

---
 scripts/crl-revoked.test | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/crl-revoked.test b/scripts/crl-revoked.test
index d15b3c69f..f1d720984 100755
--- a/scripts/crl-revoked.test
+++ b/scripts/crl-revoked.test
@@ -1,8 +1,6 @@
 #!/bin/bash
 
 #crl.test
-CERT_DIR=certs
-
 # if we can, isolate the network namespace to eliminate port collisions.
 if [[ -n "$NETWORK_UNSHARE_HELPER" ]]; then
      if [[ -z "$NETWORK_UNSHARE_HELPER_CALLED" ]]; then
@@ -32,6 +30,9 @@ server_pid=$no_pid
 # also let's add some randomness by adding pid in case multiple 'make check's
 # per source tree
 ready_file=`pwd`/wolfssl_crl_ready$$
+CERT_DIR_ORIG=certs
+CERT_DIR=$(mktemp -d -p `pwd`)
+cp -rp $CERT_DIR_ORIG/* $CERT_DIR/.
 
 remove_ready_file() {
     if test -e "$ready_file"; then
@@ -64,6 +65,7 @@ trap abort_trap INT TERM
 # instead use "exit <some value>" and this function will run automatically
 restore_file_system() {
     remove_ready_file
+    rm -rf "$CERT_DIR"
 }
 trap restore_file_system EXIT
 

From c56c4ef7ce8ee4b53525a62e7530058911ec13b6 Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Mon, 13 Mar 2023 10:37:21 -0400
Subject: [PATCH 2/2] Hacky workaround to be able to put/remove files in certs
 folder

---
 scripts/crl-revoked.test | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/crl-revoked.test b/scripts/crl-revoked.test
index f1d720984..2f48b11e6 100755
--- a/scripts/crl-revoked.test
+++ b/scripts/crl-revoked.test
@@ -16,6 +16,11 @@ elif [ "${AM_BWRAPPED-}" != "yes" ]; then
     unset AM_BWRAPPED
 fi
 
+# Workaround to not pollute the certs folder with our files that can impact other tests
+RUNNING_DIR=$(mktemp -d)
+cp -rp . $RUNNING_DIR/.
+cd $RUNNING_DIR
+
 revocation_code="-361"
 exit_code=1
 counter=0
@@ -30,9 +35,7 @@ server_pid=$no_pid
 # also let's add some randomness by adding pid in case multiple 'make check's
 # per source tree
 ready_file=`pwd`/wolfssl_crl_ready$$
-CERT_DIR_ORIG=certs
-CERT_DIR=$(mktemp -d -p `pwd`)
-cp -rp $CERT_DIR_ORIG/* $CERT_DIR/.
+CERT_DIR=certs
 
 remove_ready_file() {
     if test -e "$ready_file"; then
@@ -65,7 +68,7 @@ trap abort_trap INT TERM
 # instead use "exit <some value>" and this function will run automatically
 restore_file_system() {
     remove_ready_file
-    rm -rf "$CERT_DIR"
+    cd / && rm -rf "$RUNNING_DIR"
 }
 trap restore_file_system EXIT