From 291a875410d7a04c048f030cfbf0e679a85fcd5b Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Tue, 25 Oct 2022 10:51:56 +0200 Subject: [PATCH] Update tests scripts to no longer call estserver with "-o", since TLS-only client authentication is now enabled by default. --- java/src/com/cisco/c3m/est/test/DT/dt_start_estserver.sh | 2 +- java/src/com/cisco/c3m/est/test/DT/dt_start_estserver2.sh | 2 +- java/src/com/cisco/c3m/est/test/DT/dt_start_estserver3.sh | 2 +- java/src/com/cisco/c3m/est/test/DT/dt_start_estserver4.sh | 2 +- java/src/com/cisco/c3m/est/test/DT/dt_start_estserver5.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver.sh b/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver.sh index 0a4c93e..f802f92 100644 --- a/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver.sh +++ b/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver.sh @@ -6,7 +6,7 @@ echo "Starting dt_start_estserver.sh ..." cd $WORKSPACE/example/server # this is the main estserver instance that should be used for simple enrolls -$WORKSPACE/install/bin/estserver -o -p $EST_DT0_PORT1 --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 & +$WORKSPACE/install/bin/estserver -p $EST_DT0_PORT1 --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 & sleep 1 # the following estserver is set to reject the first attempted connection so we can test catching exceptions $WORKSPACE/install/bin/estserver -p $EST_DT0_PORT2 --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 -m 3600 & diff --git a/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver2.sh b/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver2.sh index 2a94ab4..6c45741 100644 --- a/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver2.sh +++ b/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver2.sh @@ -12,7 +12,7 @@ echo first arguement will be used as the port number = $1 cd $WORKSPACE/example/server # this is the main estserver instance that should be used for simple reenrolls -$WORKSPACE/install/bin/estserver -o -p $1 --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 & +$WORKSPACE/install/bin/estserver -p $1 --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 & sleep 3 echo "dt_start_estserver2.sh is complete..." diff --git a/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver3.sh b/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver3.sh index 828834e..1f3488d 100644 --- a/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver3.sh +++ b/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver3.sh @@ -11,7 +11,7 @@ echo "Starting dt_start_estserver3.sh ..." cd $WORKSPACE/example/server # this is the main estserver instance that should be used for simple enrolls -$WORKSPACE/install/bin/estserver -o -p $EST_CACERTS_PORT_NF --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 & +$WORKSPACE/install/bin/estserver -p $EST_CACERTS_PORT_NF --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 & sleep 3 echo "dt_start_estserver3.sh is complete..." diff --git a/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver4.sh b/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver4.sh index 4814ec5..8795197 100644 --- a/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver4.sh +++ b/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver4.sh @@ -15,7 +15,7 @@ echo first arguement will be used as the port number = $1 cd $WORKSPACE/example/server # this is the main estserver instance that should be used for simple reenrolls -$WORKSPACE/install/bin/estserver -o -p $1 --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 & +$WORKSPACE/install/bin/estserver -p $1 --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 & sleep 3 echo "dt_start_estserver4.sh is complete..." diff --git a/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver5.sh b/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver5.sh index e1f25d9..09f4671 100644 --- a/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver5.sh +++ b/java/src/com/cisco/c3m/est/test/DT/dt_start_estserver5.sh @@ -11,7 +11,7 @@ echo "Starting dt_start_estserver5.sh ..." cd $WORKSPACE/example/server # this is the main estserver instance that should be used for simple reenrolls -$WORKSPACE/install/bin/estserver -o -p $EST_DT5_PORT1 --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 & +$WORKSPACE/install/bin/estserver -p $EST_DT5_PORT1 --srp passwd.srpv -c estCA/private/estservercertandkey.pem -k estCA/private/estservercertandkey.pem -r estrealm -v -6 -d 60 & sleep 3 echo "dt_start_estserver5.sh is complete..."