test-vector support in rw-cert scenarios

testing/tests/ike/rw-cert/hosts/carol/etc/strongswan.conf

@@ -0,0 +1,14 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = test-vectors sha1 sha2 md5 aes des hmac gmp pubkey random curl
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+  crypto_test {
+    on_add = yes
+  }
+}

testing/tests/ike/rw-cert/hosts/dave/etc/strongswan.conf

@@ -1,5 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/ike/rw-cert/hosts/moon/etc/strongswan.conf

@@ -1,9 +1,15 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random pubkey hmac x509 xcbc stroke kernel-netlink
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random pubkey hmac x509 xcbc stroke kernel-netlink
 }
 
 pluto {
-  load = curl aes des sha1 sha2 md5 gmp random pubkey hmac
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random pubkey hmac
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/ikev1/rw-cert/hosts/carol/etc/strongswan.conf

@@ -0,0 +1,14 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = test-vectors sha1 sha2 md5 aes des hmac gmp pubkey random curl
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+  crypto_test {
+    on_add = yes
+  }
+}

testing/tests/ikev1/rw-cert/hosts/moon/etc/strongswan.conf

@@ -0,0 +1,14 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = test-vectors sha1 sha2 md5 aes des hmac gmp pubkey random curl
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+  crypto_test {
+    on_add = yes
+  }
+}

testing/tests/ikev2/rw-cert/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/ikev2/rw-cert/hosts/dave/etc/strongswan.conf

@@ -1,5 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/ikev2/rw-cert/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/ikev2/rw-eap-aka-id-rsa/hosts/moon/etc/ipsec.conf

@@ -23,5 +23,4 @@ conn rw-eap
 	rightsendcert=never
 	rightauth=eap-aka
 	eap_identity=%any	
-	right=%any
 	auto=add

testing/tests/ikev2/rw-eap-md5-id-radius/hosts/carol/etc/ipsec.conf

@@ -9,15 +9,16 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev2
-	authby=eap
 
 conn home
 	left=PH_IP_CAROL
 	leftnexthop=%direct
 	[email protected]
+	leftauth=eap
 	leftfirewall=yes
 	eap_identity=carol
 	right=PH_IP_MOON
 	[email protected]
 	rightsubnet=10.1.0.0/16
+	rightauth=pubkey
 	auto=add

testing/tests/ikev2/rw-eap-md5-id-radius/hosts/moon/etc/ipsec.conf

@@ -12,15 +12,15 @@ conn %default
 	keyexchange=ikev2
 
 conn rw-eap
-	authby=rsasig
-	eap=radius
-	eap_identity=%identity
 	left=PH_IP_MOON
 	leftsubnet=10.1.0.0/16
 	[email protected]
 	leftcert=moonCert.pem
+	leftauth=pubkey
 	leftfirewall=yes
 	rightid=*@strongswan.org
 	rightsendcert=never
+	rightauth=eap-radius
+	eap_identity=%any
 	right=%any
 	auto=add

testing/tests/ikev2/rw-eap-md5-radius/hosts/carol/etc/ipsec.conf

@@ -9,14 +9,15 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev2
-	authby=eap
 
 conn home
 	left=PH_IP_CAROL
 	leftnexthop=%direct
 	[email protected]
+	leftauth=eap
 	leftfirewall=yes
 	right=PH_IP_MOON
 	[email protected]
 	rightsubnet=10.1.0.0/16
+	rightauth=pubkey
 	auto=add

testing/tests/ikev2/rw-eap-md5-radius/hosts/moon/etc/ipsec.conf

@@ -12,14 +12,14 @@ conn %default
 	keyexchange=ikev2
 
 conn rw-eap
-	authby=rsasig
-	eap=radius
 	left=PH_IP_MOON
 	leftsubnet=10.1.0.0/16
 	[email protected]
 	leftcert=moonCert.pem
+	leftauth=pubkey
 	leftfirewall=yes
 	rightid=*@strongswan.org
+	rightauth=eap-radius
 	rightsendcert=never
 	right=%any
 	auto=add

testing/tests/ikev2/rw-eap-md5-rsa/hosts/carol/etc/ipsec.conf

@@ -9,14 +9,15 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev2
-	authby=eap
 
 conn home
 	left=PH_IP_CAROL
 	leftnexthop=%direct
 	[email protected]
+	leftauth=eap
 	leftfirewall=yes
 	right=PH_IP_MOON
 	[email protected]
 	rightsubnet=10.1.0.0/16
+	rightauth=pubkey
 	auto=add

testing/tests/ikev2/rw-eap-md5-rsa/hosts/moon/etc/ipsec.conf

@@ -12,14 +12,14 @@ conn %default
 	keyexchange=ikev2
 
 conn rw-eap
-	authby=rsasig
-	eap=md5
 	left=PH_IP_MOON
 	leftsubnet=10.1.0.0/16
 	[email protected]
 	leftcert=moonCert.pem
+	leftauth=pubkey
 	leftfirewall=yes
 	rightid=*@strongswan.org
+	rightauth=eap-md5
 	rightsendcert=never
 	right=%any
 	auto=add

testing/tests/ikev2/rw-eap-sim-id-radius/hosts/carol/etc/ipsec.conf

@@ -9,15 +9,16 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev2
-	authby=eap
 
 conn home
 	left=PH_IP_CAROL
 	leftnexthop=%direct
 	[email protected]
 	leftfirewall=yes
+	leftauth=eap
 	eap_identity=228060123456001
 	right=PH_IP_MOON
 	[email protected]
 	rightsubnet=10.1.0.0/16
+	rightauth=pubkey
 	auto=add

testing/tests/ikev2/rw-eap-sim-id-radius/hosts/moon/etc/ipsec.conf

@@ -12,15 +12,15 @@ conn %default
 	keyexchange=ikev2
 
 conn rw-eap
-	authby=rsasig
-	eap=radius
-	eap_identity=%identity
 	left=PH_IP_MOON
 	leftsubnet=10.1.0.0/16
 	[email protected]
 	leftcert=moonCert.pem
+	leftauth=pubkey
 	leftfirewall=yes
 	rightid=*@strongswan.org
+	rightauth=eap-radius
+        eap_identity=%any
 	rightsendcert=never
 	right=%any
 	auto=add

testing/tests/ikev2/rw-eap-sim-rsa/hosts/carol/etc/ipsec.conf

@@ -9,14 +9,15 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev2
-	authby=eap
 
 conn home
 	left=PH_IP_CAROL
 	leftnexthop=%direct
 	[email protected]
+	leftauth=eap
 	leftfirewall=yes
 	right=PH_IP_MOON
 	[email protected]
 	rightsubnet=10.1.0.0/16
+	rightauth=pubkey
 	auto=add

testing/tests/ikev2/rw-eap-sim-rsa/hosts/moon/etc/ipsec.conf

@@ -12,14 +12,14 @@ conn %default
 	keyexchange=ikev2
 
 conn rw-eapsim
-	authby=rsasig
-	eap=sim
 	left=PH_IP_MOON
 	leftsubnet=10.1.0.0/16
 	[email protected]
 	leftcert=moonCert.pem
+	leftauth=pubkey
 	leftfirewall=yes
 	rightid=*@strongswan.org
+	rightauth=eap-sim
 	right=%any
 	rightsendcert=never
 	auto=add

testing/tests/openssl-ikev1/alg-ecp-high/hosts/carol/etc/strongswan.conf

@@ -3,3 +3,9 @@
 pluto {
   load = openssl pubkey random hmac curl
 }
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}

testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/strongswan.conf

@@ -3,3 +3,9 @@
 pluto {
   load = aes des sha1 sha2 md5 gmp openssl pubkey random hmac curl
 }
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}

testing/tests/openssl-ikev1/alg-ecp-high/hosts/moon/etc/strongswan.conf

@@ -3,3 +3,9 @@
 pluto {
   load = openssl pubkey random hmac curl
 }
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}

testing/tests/openssl-ikev1/alg-ecp-low/hosts/carol/etc/strongswan.conf

@@ -3,3 +3,9 @@
 pluto {
   load = openssl pubkey random hmac curl 
 }
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}

testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/strongswan.conf

@@ -3,3 +3,9 @@
 pluto {
   load = aes des sha1 sha2 md5 gmp openssl pubkey random hmac curl
 }
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}

testing/tests/openssl-ikev1/alg-ecp-low/hosts/moon/etc/strongswan.conf

@@ -3,3 +3,9 @@
 pluto {
   load = openssl pubkey random hmac curl 
 }
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}

testing/tests/openssl-ikev1/ecdsa-certs/hosts/carol/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev1
-	authby=ecdsasig
 
 conn home
 	left=PH_IP_CAROL

testing/tests/openssl-ikev1/ecdsa-certs/hosts/carol/etc/strongswan.conf

@@ -3,3 +3,9 @@
 pluto {
   load = openssl pubkey random hmac curl
 }
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}

testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev1
-	authby=ecdsasig
 
 conn home
 	left=PH_IP_DAVE

testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf

@@ -3,3 +3,9 @@
 pluto {
   load = aes des sha1 sha2 md5 gmp openssl pubkey random hmac curl
 }
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}

testing/tests/openssl-ikev1/ecdsa-certs/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev1
-	authby=ecdsasig
 
 conn carol
 	also=moon

testing/tests/openssl-ikev1/ecdsa-certs/hosts/moon/etc/strongswan.conf

@@ -3,3 +3,9 @@
 pluto {
   load = openssl pubkey random hmac curl
 }
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}

testing/tests/openssl-ikev2/alg-blowfish/hosts/moon/etc/strongswan.conf

@@ -1,6 +1,5 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  dh_exponent_ansi_x9_42 = no
   load = curl openssl random x509 pubkey hmac stroke kernel-netlink updown
 }

testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev2
-	authby=ecdsasig
 
 conn home
 	left=PH_IP_CAROL

testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev2
-	authby=ecdsasig
 
 conn home
 	left=PH_IP_DAVE

testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/ipsec.conf

@@ -11,7 +11,6 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev2
-	authby=ecdsasig
 
 conn rw
 	left=PH_IP_MOON

testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,12 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl openssl random x509 pubkey hmac stroke kernel-netlink updown
+  load = curl test-vectors openssl random x509 pubkey hmac stroke kernel-netlink updown
 }
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
+}
+

testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/strongswan.conf

@@ -1,5 +1,12 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac stroke kernel-netlink updown
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac stroke kernel-netlink updown
+}
+
+libstrongswan {
+  crypto_test {
+    required = yes
+    on_add = yes
+  }
 }

testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/strongswan.conf

@@ -1,6 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  dh_exponent_ansi_x9_42 = no
+  load = curl test-vectors openssl random x509 pubkey hmac stroke kernel-netlink updown
-  load = curl openssl random x509 pubkey hmac stroke kernel-netlink updown
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/pfkey/rw-cert/hosts/carol/etc/strongswan.conf

@@ -1,5 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-pfkey kernel-netlink updown
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-pfkey kernel-netlink updown
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/pfkey/rw-cert/hosts/dave/etc/strongswan.conf

@@ -1,5 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-pfkey kernel-netlink updown
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-pfkey kernel-netlink updown
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/pfkey/rw-cert/hosts/moon/etc/strongswan.conf

@@ -1,5 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 charon {
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-pfkey kernel-netlink updown
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-pfkey kernel-netlink updown
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/sql/rw-cert/hosts/carol/etc/strongswan.conf

@@ -6,5 +6,11 @@ charon {
       database = sqlite:///etc/ipsec.d/ipsec.db 
     }
   }
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown sqlite sql
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown sqlite sql
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/sql/rw-cert/hosts/dave/etc/strongswan.conf

@@ -6,5 +6,11 @@ charon {
       database = sqlite:///etc/ipsec.d/ipsec.db 
     }
   }
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown sqlite sql
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown sqlite sql
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }

testing/tests/sql/rw-cert/hosts/moon/etc/strongswan.conf

@@ -6,5 +6,11 @@ charon {
       database = sqlite:///etc/ipsec.d/ipsec.db 
     }
   }
-  load = curl aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown sqlite sql
+  load = curl test-vectors aes des sha1 sha2 md5 gmp random x509 pubkey hmac xcbc stroke kernel-netlink updown sqlite sql
+}
+
+libstrongswan {
+  crypto_test {
+    on_add = yes
+  }
 }