From e2fc8e037ea6bb5de92b25ec9c12a624737ac5ca Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 8 Apr 2024 18:41:29 +0200
Subject: Merging upstream version 1:9.18.24.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 bin/tests/system/kasp/setup.sh | 44 ++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'bin/tests/system/kasp/setup.sh')

diff --git a/bin/tests/system/kasp/setup.sh b/bin/tests/system/kasp/setup.sh
index 67cfa92..1d11ba9 100644
--- a/bin/tests/system/kasp/setup.sh
+++ b/bin/tests/system/kasp/setup.sh
@@ -19,62 +19,60 @@ set -e
 $SHELL clean.sh
 
 mkdir keys
+mkdir ns3/keys
 
 copy_setports ns2/named.conf.in ns2/named.conf
-if ! $SHELL ../testcrypto.sh -q RSASHA1
-then
-	copy_setports ns3/named-fips.conf.in ns3/named.conf
+if ! $SHELL ../testcrypto.sh -q RSASHA1; then
+  copy_setports ns3/named-fips.conf.in ns3/named.conf
 else
-	copy_setports ns3/named-fips.conf.in ns3/named-fips.conf
-	copy_setports ns3/named.conf.in ns3/named.conf
+  copy_setports ns3/named-fips.conf.in ns3/named-fips.conf
+  copy_setports ns3/named.conf.in ns3/named.conf
 fi
 copy_setports ns4/named.conf.in ns4/named.conf
 copy_setports ns5/named.conf.in ns5/named.conf
 copy_setports ns6/named.conf.in ns6/named.conf
 
 if $SHELL ../testcrypto.sh ed25519; then
-	echo "yes" > ed25519-supported.file
+  echo "yes" >ed25519-supported.file
 fi
 
 if $SHELL ../testcrypto.sh ed448; then
-	echo "yes" > ed448-supported.file
+  echo "yes" >ed448-supported.file
 fi
 
 copy_setports ns3/policies/autosign.conf.in ns3/policies/autosign.conf
 copy_setports ns3/policies/kasp-fips.conf.in ns3/policies/kasp-fips.conf
 copy_setports ns3/policies/kasp.conf.in ns3/policies/kasp.conf
-if ! $SHELL ../testcrypto.sh -q RSASHA1
-then
-	cp ns3/policies/kasp-fips.conf ns3/policies/kasp.conf
+if ! $SHELL ../testcrypto.sh -q RSASHA1; then
+  cp ns3/policies/kasp-fips.conf ns3/policies/kasp.conf
 fi
 
 copy_setports ns6/policies/csk1.conf.in ns6/policies/csk1.conf
 copy_setports ns6/policies/csk2.conf.in ns6/policies/csk2.conf
 copy_setports ns6/policies/kasp-fips.conf.in ns6/policies/kasp-fips.conf
 copy_setports ns6/policies/kasp.conf.in ns6/policies/kasp.conf
-if ! $SHELL ../testcrypto.sh -q RSASHA1
-then
-	cp ns6/policies/kasp-fips.conf ns6/policies/kasp.conf
+if ! $SHELL ../testcrypto.sh -q RSASHA1; then
+  cp ns6/policies/kasp-fips.conf ns6/policies/kasp.conf
 fi
 
 # Setup zones
 (
-	cd ns2
-	$SHELL setup.sh
+  cd ns2
+  $SHELL setup.sh
 )
 (
-	cd ns3
-	$SHELL setup.sh
+  cd ns3
+  $SHELL setup.sh
 )
 (
-	cd ns4
-	$SHELL setup.sh
+  cd ns4
+  $SHELL setup.sh
 )
 (
-	cd ns5
-	$SHELL setup.sh
+  cd ns5
+  $SHELL setup.sh
 )
 (
-	cd ns6
-	$SHELL setup.sh
+  cd ns6
+  $SHELL setup.sh
 )
-- 
cgit v1.2.3