Merging upstream version 1:9.18.24.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 44 insertions, 44 deletions

diff --git a/bin/tests/system/ecdsa/ns1/sign.sh b/bin/tests/system/ecdsa/ns1/sign.sh
index f922225..b773344 100644
--- a/bin/tests/system/ecdsa/ns1/sign.sh
+++ b/bin/tests/system/ecdsa/ns1/sign.sh
@@ -24,34 +24,34 @@ echo_i "ns1/sign.sh"
 cp $infile $zonefile
 
 if [ -f ../ecdsa256-supported.file ]; then
-	zsk256=$($KEYGEN -q -a ECDSA256 -n zone "$zone")
-	ksk256=$($KEYGEN -q -a ECDSA256 -n zone -f KSK "$zone")
-	cat "$ksk256.key" "$zsk256.key" >> "$zonefile"
-	$DSFROMKEY -a sha-256 "$ksk256.key" >> dsset-256
+  zsk256=$($KEYGEN -q -a ECDSA256 -n zone "$zone")
+  ksk256=$($KEYGEN -q -a ECDSA256 -n zone -f KSK "$zone")
+  cat "$ksk256.key" "$zsk256.key" >>"$zonefile"
+  $DSFROMKEY -a sha-256 "$ksk256.key" >>dsset-256
 fi
 
 if [ -f ../ecdsa384-supported.file ]; then
-	zsk384=$($KEYGEN -q -a ECDSA384 -n zone "$zone")
-	ksk384=$($KEYGEN -q -a ECDSA384 -n zone -f KSK "$zone")
-	cat "$ksk384.key" "$zsk384.key" >> "$zonefile"
-	$DSFROMKEY -a sha-256 "$ksk384.key" >> dsset-256
+  zsk384=$($KEYGEN -q -a ECDSA384 -n zone "$zone")
+  ksk384=$($KEYGEN -q -a ECDSA384 -n zone -f KSK "$zone")
+  cat "$ksk384.key" "$zsk384.key" >>"$zonefile"
+  $DSFROMKEY -a sha-256 "$ksk384.key" >>dsset-256
 fi
 
 # Configure the resolving server with a static key.
 if [ -f ../ecdsa256-supported.file ]; then
-	keyfile_to_static_ds $ksk256 > trusted.conf
-	cp trusted.conf ../ns2/trusted.conf
+  keyfile_to_static_ds $ksk256 >trusted.conf
+  cp trusted.conf ../ns2/trusted.conf
 else
-	keyfile_to_static_ds $ksk384 > trusted.conf
-	cp trusted.conf ../ns2/trusted.conf
+  keyfile_to_static_ds $ksk384 >trusted.conf
+  cp trusted.conf ../ns2/trusted.conf
 fi
 
 if [ -f ../ecdsa384-supported.file ]; then
-	keyfile_to_static_ds $ksk384 > trusted.conf
-	cp trusted.conf ../ns3/trusted.conf
+  keyfile_to_static_ds $ksk384 >trusted.conf
+  cp trusted.conf ../ns3/trusted.conf
 else
-	keyfile_to_static_ds $ksk256 > trusted.conf
-	cp trusted.conf ../ns3/trusted.conf
+  keyfile_to_static_ds $ksk256 >trusted.conf
+  cp trusted.conf ../ns3/trusted.conf
 fi
 
-$SIGNER -P -g -o "$zone" "$zonefile" > /dev/null 2> signer.err || cat signer.err
+$SIGNER -P -g -o "$zone" "$zonefile" >/dev/null 2>signer.err || cat signer.err
diff --git a/bin/tests/system/ecdsa/ns2/named.conf.in b/bin/tests/system/ecdsa/ns2/named.conf.in
index fd125d3..bb8a89c 100644
--- a/bin/tests/system/ecdsa/ns2/named.conf.in
+++ b/bin/tests/system/ecdsa/ns2/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
 	type hint;
-	file "../../common/root.hint";
+	file "../../_common/root.hint";
 };
 
 include "trusted.conf";
diff --git a/bin/tests/system/ecdsa/ns3/named.conf.in b/bin/tests/system/ecdsa/ns3/named.conf.in
index f1a80b6..0053898 100644
--- a/bin/tests/system/ecdsa/ns3/named.conf.in
+++ b/bin/tests/system/ecdsa/ns3/named.conf.in
@@ -30,7 +30,7 @@ options {
 
 zone "." {
 	type hint;
-	file "../../common/root.hint";
+	file "../../_common/root.hint";
 };
 
 include "trusted.conf";
diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh
index 86cd1cf..466d015 100644
--- a/bin/tests/system/ecdsa/setup.sh
+++ b/bin/tests/system/ecdsa/setup.sh
@@ -16,17 +16,17 @@ set -e
 . ../conf.sh
 
 if $SHELL ../testcrypto.sh ecdsap256sha256; then
-	echo "yes" > ecdsa256-supported.file
+  echo "yes" >ecdsa256-supported.file
 fi
 
 if $SHELL ../testcrypto.sh ecdsap384sha384; then
-	echo "yes" > ecdsa384-supported.file
+  echo "yes" >ecdsa384-supported.file
 fi
 
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
 copy_setports ns3/named.conf.in ns3/named.conf
 (
-	cd ns1
-	$SHELL sign.sh
+  cd ns1
+  $SHELL sign.sh
 )
diff --git a/bin/tests/system/ecdsa/tests.sh b/bin/tests/system/ecdsa/tests.sh
index f1210ec..f596fbf 100644
--- a/bin/tests/system/ecdsa/tests.sh
+++ b/bin/tests/system/ecdsa/tests.sh
@@ -19,35 +19,35 @@ status=0
 n=0
 
 dig_with_opts() {
-    "$DIG" +tcp +noau +noadd +nosea +nostat +nocmd +dnssec -p "$PORT" "$@"
+  "$DIG" +tcp +noau +noadd +nosea +nostat +nocmd +dnssec -p "$PORT" "$@"
 }
 
 if [ -f ecdsa256-supported.file ]; then
-	n=$((n+1))
-	echo_i "checking that ECDSA256 positive validation works ($n)"
-	ret=0
-	dig_with_opts . @10.53.0.1 soa > dig.out.ns1.test$n || ret=1
-	dig_with_opts . @10.53.0.2 soa > dig.out.ns2.test$n || ret=1
-	$PERL ../digcomp.pl dig.out.ns1.test$n dig.out.ns2.test$n || ret=1
-	grep "flags:.*ad.*QUERY" dig.out.ns2.test$n > /dev/null || ret=1
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=$((status+ret))
+  n=$((n + 1))
+  echo_i "checking that ECDSA256 positive validation works ($n)"
+  ret=0
+  dig_with_opts . @10.53.0.1 soa >dig.out.ns1.test$n || ret=1
+  dig_with_opts . @10.53.0.2 soa >dig.out.ns2.test$n || ret=1
+  $PERL ../digcomp.pl dig.out.ns1.test$n dig.out.ns2.test$n || ret=1
+  grep "flags:.*ad.*QUERY" dig.out.ns2.test$n >/dev/null || ret=1
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
 else
-	echo_i "algorithm ECDSA256 not supported, skipping test"
+  echo_i "algorithm ECDSA256 not supported, skipping test"
 fi
 
 if [ -f ecdsa384-supported.file ]; then
-	n=$((n+1))
-	echo_i "checking that ECDSA384 positive validation works ($n)"
-	ret=0
-	dig_with_opts . @10.53.0.1 soa > dig.out.ns1.test$n || ret=1
-	dig_with_opts . @10.53.0.3 soa > dig.out.ns3.test$n || ret=1
-	$PERL ../digcomp.pl dig.out.ns1.test$n dig.out.ns3.test$n || ret=1
-	grep "flags:.*ad.*QUERY" dig.out.ns3.test$n > /dev/null || ret=1
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=$((status+ret))
+  n=$((n + 1))
+  echo_i "checking that ECDSA384 positive validation works ($n)"
+  ret=0
+  dig_with_opts . @10.53.0.1 soa >dig.out.ns1.test$n || ret=1
+  dig_with_opts . @10.53.0.3 soa >dig.out.ns3.test$n || ret=1
+  $PERL ../digcomp.pl dig.out.ns1.test$n dig.out.ns3.test$n || ret=1
+  grep "flags:.*ad.*QUERY" dig.out.ns3.test$n >/dev/null || ret=1
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
 else
-	echo_i "algorithm ECDSA384 not supported, skipping test"
+  echo_i "algorithm ECDSA384 not supported, skipping test"
 fi
 
 echo_i "exit status: $status"