X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=test%2Fsptps-basic.test;h=9f86c8cd4d38db2051d682ed467c318a7203d83b;hb=843990d8df0c060db9b64e170996e9d49c8c921d;hp=2abb99c0f6a010a366585eae59d8f6e2669bd4d0;hpb=2cd8e2b8e8d60fdeb633afe54eaf38e18afb04dc;p=tinc

diff --git a/test/sptps-basic.test b/test/sptps-basic.test
index 2abb99c0..9f86c8cd 100755
--- a/test/sptps-basic.test
+++ b/test/sptps-basic.test
@@ -2,31 +2,31 @@
 
 . ./testlib.sh
 
+# Skip this test if we did not compile sptps_test
+
+test -e $sptps_test || exit 77
+
 # Generate keys
 
 mkdir -p $d1
 
-openssl ecparam -genkey -name secp521r1 -noout -out $d1/server.priv
-openssl ecparam -genkey -name secp521r1 -noout -out $d1/client.priv
-yes '' | openssl req -new -pubkey -key $d1/server.priv -noout -out $d1/server.pub
-echo
-yes '' | openssl req -new -pubkey -key $d1/client.priv -noout -out $d1/client.pub
-echo
+$sptps_keypair $d1/server.priv $d1/server.pub
+$sptps_keypair $d1/client.priv $d1/client.pub
 
 # Test transfer of a simple file.
 
-(sleep 1; $sptps_test -q $d1/client.priv $d1/server.pub localhost 32750 <../README) &
-$sptps_test $d1/server.priv $d1/client.pub 32750 >$d1/out1
+(sleep 1; $sptps_test -4 -q $d1/client.priv $d1/server.pub localhost 32750 <../README) &
+$sptps_test -4 $d1/server.priv $d1/client.pub 32750 >$d1/out1
 cmp $d1/out1 ../README
 
-$sptps_test -q $d1/server.priv $d1/client.pub 32750 <../NEWS &
+$sptps_test -4 -q $d1/server.priv $d1/client.pub 32750 <../NEWS &
 sleep 1
-$sptps_test $d1/client.priv $d1/server.pub localhost 32750 > $d1/out2
+$sptps_test -4 $d1/client.priv $d1/server.pub localhost 32750 > $d1/out2
 cmp $d1/out2 ../NEWS
 
 # Datagram mode
 
-$sptps_test -dq $d1/server.priv $d1/client.pub 32750 <../COPYING &
+$sptps_test -4 -dq $d1/server.priv $d1/client.pub 32750 <../COPYING &
 sleep 1
-sleep 1 | $sptps_test -dq $d1/client.priv $d1/server.pub localhost 32750 >$d1/out3
+sleep 1 | $sptps_test -4 -dq $d1/client.priv $d1/server.pub localhost 32750 >$d1/out3
 cmp $d1/out3 ../COPYING