Update tests scripts to no longer call estserver with "-o", since TLS-only client authentication is now enabled by default.

Author: Fredrik Orderud

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 &

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..."

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..."

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..."

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..."