testing: added RSA-PSS test cases

Signed-off-by: Paul Wouters <pwouters@redhat.com>
libreswan · Aug 12, 2018 · 83fc58d · 83fc58d
1 parent a363796
commit 83fc58d
Show file tree

Hide file tree

Showing 81 changed files with 1,263 additions and 65 deletions.
diff --git a/testing/crypto/rsa-v2-08/rsa-v2.c b/testing/crypto/rsa-v2-08/rsa-v2.c
@@ -144,10 +144,11 @@ int main(int argc, char *argv[])
 		(struct hash_desc *)ikev2_alg_find(IKE_ALG_HASH,
 						       st1.st_oakley.prf_hash);
 
-	ikev2_calculate_rsa_sha1(&st1,
+	ikev2_calculate_rsa_hash(&st1,
 				 INITIATOR,
 				 idhash,
-				 &outs);
+				 &outs,
+				 IKEv2_AUTH_HASH_SHA1);
 
 	DBG_dump_pbs(&outs);
 
@@ -172,14 +173,15 @@ int main(int argc, char *argv[])
 
 	show_one_connection(c1);
 	{
-		stf_status stat = ikev2_verify_rsa_sha1(&st1,
+		stf_status stat = ikev2_verify_rsa_hash(&st1,
 							RESPONDER,
 							idhash,
 #ifdef USE_KEYRR
 							NULL,   /* keys from dns */
 #endif
 							NULL,   /* gateways from dns */
-							&outs);
+							&outs,
+							IKEv2_AUTH_HASH_SHA1);
 		printf("stf status: %s\n", enum_name(&stfstatus_name, stat));
 	}
 

diff --git a/testing/pluto/certoe-10-symmetric-cert-whack/east.console.txt b/testing/pluto/certoe-10-symmetric-cert-whack/east.console.txt
@@ -30,14 +30,12 @@ east #
 east #
  grep "negotiated connection" /tmp/pluto.log
 "clear-or-private#192.1.3.0/24"[1] ...192.1.3.209 #2: negotiated connection [192.1.2.23-192.1.2.23:0-65535 0] -> [192.1.3.209-192.1.3.209:0-65535 0]
-east #
- # you should see only Digital Signatures which supports only RSA now
 east #
  grep IKEv2_AUTH_ OUTPUT/*pluto.log
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
 east #
 east #
  ../bin/check-for-core.sh

diff --git a/testing/pluto/certoe-10-symmetric-cert-whack/final.sh b/testing/pluto/certoe-10-symmetric-cert-whack/final.sh
@@ -1,7 +1,6 @@
 # A tunnel should have established with non-zero byte counters
 ipsec whack --trafficstatus 
 grep "negotiated connection" /tmp/pluto.log
-# you should see only Digital Signatures which supports only RSA now
 grep IKEv2_AUTH_ OUTPUT/*pluto.log 
 : ==== cut ====
 ipsec auto --status

diff --git a/testing/pluto/certoe-10-symmetric-cert-whack/nic.console.txt b/testing/pluto/certoe-10-symmetric-cert-whack/nic.console.txt
@@ -9,14 +9,12 @@ nic #
 nic #
  grep "negotiated connection" /tmp/pluto.log
 grep: /tmp/pluto.log: No such file or directory
-nic #
- # you should see only Digital Signatures which supports only RSA now
 nic #
  grep IKEv2_AUTH_ OUTPUT/*pluto.log
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
 nic #
 nic #
  ../bin/check-for-core.sh

diff --git a/testing/pluto/certoe-10-symmetric-cert-whack/road.console.txt b/testing/pluto/certoe-10-symmetric-cert-whack/road.console.txt
@@ -128,14 +128,12 @@ road #
 road #
  grep "negotiated connection" /tmp/pluto.log
 "private-or-clear#192.1.2.0/24"[1] ...192.1.2.23 #2: negotiated connection [192.1.3.209-192.1.3.209:0-65535 0] -> [192.1.2.23-192.1.2.23:0-65535 0]
-road #
- # you should see only Digital Signatures which supports only RSA now
 road #
  grep IKEv2_AUTH_ OUTPUT/*pluto.log
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
 road #
 road #
  ../bin/check-for-core.sh

diff --git a/testing/pluto/certoe-11-symmetric-cert-nat/east.console.txt b/testing/pluto/certoe-11-symmetric-cert-nat/east.console.txt
@@ -30,14 +30,12 @@ east #
 east #
  grep "negotiated connection" /tmp/pluto.log
 "clear-or-private#192.1.2.254/32"[1] ...192.1.2.254===10.0.10.1/32 #2: negotiated connection [192.1.2.23-192.1.2.23:0-65535 0] -> [10.0.10.1-10.0.10.1:0-65535 0]
-east #
- # you should see only Digital Signatures that currently only supports RSA
 east #
  grep IKEv2_AUTH_ OUTPUT/*pluto.log
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
 east #
 east #
  ../bin/check-for-core.sh

diff --git a/testing/pluto/certoe-11-symmetric-cert-nat/final.sh b/testing/pluto/certoe-11-symmetric-cert-nat/final.sh
@@ -1,7 +1,6 @@
 # A tunnel should have established with non-zero byte counters
 ipsec whack --trafficstatus 
 grep "negotiated connection" /tmp/pluto.log
-# you should see only Digital Signatures that currently only supports RSA
 grep IKEv2_AUTH_ OUTPUT/*pluto.log 
 : ==== cut ====
 ipsec auto --status

diff --git a/testing/pluto/certoe-11-symmetric-cert-nat/nic.console.txt b/testing/pluto/certoe-11-symmetric-cert-nat/nic.console.txt
@@ -19,14 +19,12 @@ nic #
 nic #
  grep "negotiated connection" /tmp/pluto.log
 grep: /tmp/pluto.log: No such file or directory
-nic #
- # you should see only Digital Signatures that currently only supports RSA
 nic #
  grep IKEv2_AUTH_ OUTPUT/*pluto.log
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
 nic #
 nic #
  ../bin/check-for-core.sh

diff --git a/testing/pluto/certoe-11-symmetric-cert-nat/road.console.txt b/testing/pluto/certoe-11-symmetric-cert-nat/road.console.txt
@@ -129,14 +129,12 @@ road #
 road #
  grep "negotiated connection" /tmp/pluto.log
 "private-or-clear#192.1.2.0/24"[1] 10.0.10.1/32=== ...192.1.2.23 #2: negotiated connection [10.0.10.1-10.0.10.1:0-65535 0] -> [192.1.2.23-192.1.2.23:0-65535 0]
-road #
- # you should see only Digital Signatures that currently only supports RSA
 road #
  grep IKEv2_AUTH_ OUTPUT/*pluto.log
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/road.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
 road #
 road #
  ../bin/check-for-core.sh

diff --git a/testing/pluto/ikev2-asymmetric-15-rsaraw-rsaraw/east.console.txt b/testing/pluto/ikev2-asymmetric-15-rsaraw-rsaraw/east.console.txt
@@ -30,10 +30,10 @@ east #
 initdone
 east #
  grep IKEv2_AUTH_ OUTPUT/*pluto.log
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/west.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/west.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/west.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/west.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
 east #
 east #
  ../bin/check-for-core.sh

diff --git a/testing/pluto/ikev2-asymmetric-15-rsaraw-rsaraw/west.console.txt b/testing/pluto/ikev2-asymmetric-15-rsaraw-rsaraw/west.console.txt
@@ -78,10 +78,10 @@ west #
 done
 west #
  grep IKEv2_AUTH_ OUTPUT/*pluto.log
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/west.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
-OUTPUT/west.pluto.log:|    auth method: IKEv2_AUTH_DIGSIG (0xe)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/east.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/west.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
+OUTPUT/west.pluto.log:|    auth method: IKEv2_AUTH_RSA (0x1)
 west #
 west #
  ../bin/check-for-core.sh

diff --git a/testing/pluto/interop-ikev2-strongswan-04-responder-impair/description.txt b/testing/pluto/interop-ikev2-strongswan-04-responder-impair/description.txt
@@ -3,7 +3,7 @@ Basic pluto with IKEv2 using X.509 on the initiator (west), and Strongswan on
 the responder (east) with impair.
 
 Impairment is introduced in such a way that , the Signature hash notification is
-not sent. Therefore Authentication method is no longer Digital Signature , but RSA (legacy)
+not sent. Therefore Authentication method is no longer Digital Signature , but RSA with SHA1 (old style RSA)
 
 This case is to be sure that libreswan without Digital Signatures(RFC 7427) ie an older version
 can still interop with Strongwan (with Digital Signature implemented)

diff --git a/testing/pluto/interop-ikev2-strongswan-04-responder-impair/east.conf b/testing/pluto/interop-ikev2-strongswan-04-responder-impair/east.conf
@@ -5,6 +5,8 @@ config setup
 
 conn westnet-eastnet-ikev2
 	authby=rsasig
+	leftauth=ike:rsa/pss-sha256
+	rightauth=ike:rsa/pss-sha256
 	#auto=start
 	left=192.1.2.45
 	leftsubnet=192.0.1.0/24

diff --git a/testing/pluto/interop-ikev2-strongswan-04-responder-impair/west.conf b/testing/pluto/interop-ikev2-strongswan-04-responder-impair/west.conf
@@ -16,7 +16,7 @@ conn westnet-eastnet-ikev2
 	retransmit-interval=15000 # slow retransmits
 	also=westnet-eastnet-x509
 	ikev2=insist
-	authby=rsasig
+	authby=rsa-sha2_256,rsasig
 	leftsendcert=always
 	rightsendcert=never
 

diff --git a/testing/pluto/interop-ikev2-strongswan-04-x509-responder/description.txt b/testing/pluto/interop-ikev2-strongswan-04-x509-responder/description.txt
@@ -5,5 +5,7 @@ the responder (east).
 This is the reverse test of interop-ikev2-strongswan-05
 
 By default the Authentication method now is Digital Signatures.
-We currently supoort RSA with SHA1  only.
+We currently supoort RSA-SHA2 and it's variants.
+
+Authentication should be successfull with rsa-sha2 (rsa-sh2_256)
 
diff --git a/testing/pluto/interop-ikev2-strongswan-04-x509-responder/east.conf b/testing/pluto/interop-ikev2-strongswan-04-x509-responder/east.conf
@@ -5,6 +5,8 @@ config setup
 
 conn westnet-eastnet-ikev2
 	authby=rsasig
+	leftauth=ike:rsa/pss-sha256
+	rightauth=ike:rsa/pss-sha256
 	#auto=start
 	left=192.1.2.45
 	leftsubnet=192.0.1.0/24

diff --git a/testing/pluto/interop-ikev2-strongswan-04-x509-responder/eaststrongswan.conf b/testing/pluto/interop-ikev2-strongswan-04-x509-responder/eaststrongswan.conf
@@ -4,6 +4,7 @@ charon {
 
     # number of worker threads in charon
     threads = 16
+    rsa_pss = yes
 
     # send strongswan vendor ID?
     # send_vendor_id = yes

diff --git a/testing/pluto/interop-ikev2-strongswan-04-x509-responder/west.conf b/testing/pluto/interop-ikev2-strongswan-04-x509-responder/west.conf
@@ -15,7 +15,7 @@ config setup
 conn westnet-eastnet-ikev2
 	also=westnet-eastnet-x509
 	ikev2=insist
-	authby=rsasig
+	authby=rsa-sha2
 	leftsendcert=always
 	#leftid="C=CA, ST=Ontario, O=Libreswan, OU=Test Department, CN=west.testing.libreswan.org, E=testing.libreswan.org"
 	rightsendcert=never

diff --git a/testing/pluto/interop-ikev2-strongswan-04-x509-responder/west.console.txt b/testing/pluto/interop-ikev2-strongswan-04-x509-responder/west.console.txt
@@ -47,7 +47,7 @@ west #
 002 "westnet-eastnet-ikev2" #2: IKEv2 mode peer ID is ID_DER_ASN1_DN: 'C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=east.testing.libreswan.org, E=user-east@testing.libreswan.org'
 003 "westnet-eastnet-ikev2" #2: Authenticated using RSA
 002 "westnet-eastnet-ikev2" #2: negotiated connection [192.0.1.0-192.0.1.255:0-65535 0] -> [192.0.2.0-192.0.2.255:0-65535 0]
-004 "westnet-eastnet-ikev2" #2: STATE_V2_IPSEC_I: IPsec SA established tunnel mode {ESP=>0xESPESP <0xESPESP xfrm=AES_CBC_128-HMAC_SHA2_256_128 NATOA=none NATD=none DPD=passive}
+004 "westnet-eastnet-ikev2" #2: STATE_V2_IPSEC_I: IPsec SA established tunnel mode {ESP=>0xESPESP <0xESPESP xfrm=AES_CBC_256-HMAC_SHA2_256_128 NATOA=none NATD=none DPD=passive}
 west #
  ping -n -c4 -I 192.0.1.254 192.0.2.254
 PING 192.0.2.254 (192.0.2.254) from 192.0.1.254 : 56(84) bytes of data.

diff --git a/testing/pluto/interop-ikev2-strongswan-37-initiator-no-digsig/description.txt b/testing/pluto/interop-ikev2-strongswan-37-initiator-no-digsig/description.txt
@@ -0,0 +1,9 @@
+Basic pluto with IKEv2 using X.509 on the responder (east), and Strongswan on
+the initiator (west).
+
+This is the basic test for Authentication method NOT as Digital Signatures as 
+specified in RFC 7427. 
+
+Authentication is successful with RSA-SHA1 (old style rsa)
+
+
diff --git a/...-strongswan-37-initiator-digsig/east.conf → ...rongswan-37-initiator-no-digsig/east.conf b/...-strongswan-37-initiator-digsig/east.conf → ...rongswan-37-initiator-no-digsig/east.conf
diff --git a/...swan-37-initiator-digsig/east.console.txt → ...n-37-initiator-no-digsig/east.console.txt b/...swan-37-initiator-digsig/east.console.txt → ...n-37-initiator-no-digsig/east.console.txt
diff --git a/...trongswan-37-initiator-digsig/eastinit.sh → ...ngswan-37-initiator-no-digsig/eastinit.sh b/...trongswan-37-initiator-digsig/eastinit.sh → ...ngswan-37-initiator-no-digsig/eastinit.sh
diff --git a/...2-strongswan-37-initiator-digsig/final.sh → ...trongswan-37-initiator-no-digsig/final.sh b/...2-strongswan-37-initiator-digsig/final.sh → ...trongswan-37-initiator-no-digsig/final.sh
diff --git a/...ongswan-37-initiator-digsig/testparams.sh → ...swan-37-initiator-no-digsig/testparams.sh b/...ongswan-37-initiator-digsig/testparams.sh → ...swan-37-initiator-no-digsig/testparams.sh
diff --git a/...-strongswan-37-initiator-digsig/west.conf → ...rongswan-37-initiator-no-digsig/west.conf b/...-strongswan-37-initiator-digsig/west.conf → ...rongswan-37-initiator-no-digsig/west.conf
diff --git a/...swan-37-initiator-digsig/west.console.txt → ...n-37-initiator-no-digsig/west.console.txt b/...swan-37-initiator-digsig/west.console.txt → ...n-37-initiator-no-digsig/west.console.txt
@@ -35,14 +35,14 @@ generating IKE_SA_INIT request 0 [ SA KE No N(NATD_S_IP) N(NATD_D_IP) N(FRAG_SUP
 sending packet: from 192.1.2.45[500] to 192.1.2.23[500] (XXX bytes)
 received packet: from 192.1.2.23[500] to 192.1.2.45[500] (XXX bytes)
 parsed IKE_SA_INIT response 0 [ N(INVAL_KE) ]
-peer didn't accept DH group CURVE_25519, it requested MODP_2048
+peer didn't accept DH group ECP_256, it requested MODP_2048
 initiating IKE_SA westnet-eastnet-ikev2[1] to 192.1.2.23
 generating IKE_SA_INIT request 0 [ SA KE No N(NATD_S_IP) N(NATD_D_IP) N(FRAG_SUP) N(HASH_ALG) N(REDIR_SUP) ]
 sending packet: from 192.1.2.45[500] to 192.1.2.23[500] (XXX bytes)
 received packet: from 192.1.2.23[500] to 192.1.2.45[500] (XXX bytes)
-parsed IKE_SA_INIT response 0 [ SA KE No N(FRAG_SUP) N(HASH_ALG) N(NATD_S_IP) N(NATD_D_IP) CERTREQ ]
+parsed IKE_SA_INIT response 0 [ SA KE No N(FRAG_SUP) N(NATD_S_IP) N(NATD_D_IP) CERTREQ ]
 received cert request for "C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=Libreswan test CA for mainca, E=testing@libreswan.org"
-authentication of 'C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=west.testing.libreswan.org, E=user-west@testing.libreswan.org' (myself) with RSA_EMSA_PKCS1_SHA1 successful
+authentication of 'C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=west.testing.libreswan.org, E=user-west@testing.libreswan.org' (myself) with RSA signature successful
 establishing CHILD_SA westnet-eastnet-ikev2{1}
 generating IKE_AUTH request 1 [ IDi N(INIT_CONTACT) IDr AUTH SA TSi TSr N(MOBIKE_SUP) N(ADD_4_ADDR) N(ADD_4_ADDR) N(EAP_ONLY) N(MSG_ID_SYN_SUP) ]
 sending packet: from 192.1.2.45[4500] to 192.1.2.23[4500] (XXX bytes)
@@ -65,7 +65,7 @@ crl fetching failed
 certificate status is not available
   reached self-signed root ca with a path length of 0
   using trusted certificate "C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=east.testing.libreswan.org, E=user-east@testing.libreswan.org"
-authentication of 'C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=east.testing.libreswan.org, E=user-east@testing.libreswan.org' with RSA_EMSA_PKCS1_SHA1 successful
+authentication of 'C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=east.testing.libreswan.org, E=user-east@testing.libreswan.org' with RSA signature successful
 IKE_SA westnet-eastnet-ikev2[1] established between 192.1.2.45[C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=west.testing.libreswan.org, E=user-west@testing.libreswan.org]...192.1.2.23[C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=east.testing.libreswan.org, E=user-east@testing.libreswan.org]
 scheduling reauthentication in XXXs
 maximum IKE_SA lifetime XXXs
@@ -82,10 +82,9 @@ PING 192.0.2.254 (192.0.2.254) from 192.0.1.254 : 56(84) bytes of data.
 4 packets transmitted, 4 received, 0% packet loss, time XXXX
 rtt min/avg/max/mdev = 0.XXX/0.XXX/0.XXX/0.XXX ms
 west #
- # hash algorithm notication should be received
+ # hash algorithm notication should NOT be received
 west #
  grep SIGNATURE_HASH_ALGO /tmp/charon.log | cut -f 2 -d "]"
- received SIGNATURE_HASH_ALGORITHMS notify
 west #
  echo done
 done

diff --git a/...rongswan-37-initiator-digsig/west.secrets → ...gswan-37-initiator-no-digsig/west.secrets b/...rongswan-37-initiator-digsig/west.secrets → ...gswan-37-initiator-no-digsig/west.secrets
diff --git a/...trongswan-37-initiator-digsig/westinit.sh → ...ngswan-37-initiator-no-digsig/westinit.sh b/...trongswan-37-initiator-digsig/westinit.sh → ...ngswan-37-initiator-no-digsig/westinit.sh
diff --git a/testing/pluto/interop-ikev2-strongswan-37-initiator-no-digsig/westrun.sh b/testing/pluto/interop-ikev2-strongswan-37-initiator-no-digsig/westrun.sh
@@ -0,0 +1,7 @@
+strongswan up westnet-eastnet-ikev2
+ping -n -c4 -I 192.0.1.254 192.0.2.254
+
+# hash algorithm notication should NOT be received
+grep SIGNATURE_HASH_ALGO /tmp/charon.log | cut -f 2 -d "]" 
+
+echo done
diff --git a/...n-37-initiator-digsig/weststrongswan.conf → ...7-initiator-no-digsig/weststrongswan.conf b/...n-37-initiator-digsig/weststrongswan.conf → ...7-initiator-no-digsig/weststrongswan.conf
diff --git a/testing/pluto/interop-ikev2-strongswan-38-digsig-impair/description.txt b/testing/pluto/interop-ikev2-strongswan-38-digsig-impair/description.txt
@@ -9,5 +9,7 @@ This is to ensure that Libreswan with default Authentication type as
 Digital Signatures (RFC 7427 )can still interop with an older version of strongswan that does not 
 support RFC 7427
 
+Authentication should be successfulk with RSA-SHA1 (old style RSA)
+
 
 
diff --git a/testing/pluto/interop-ikev2-strongswan-38-digsig-impair/west.console.txt b/testing/pluto/interop-ikev2-strongswan-38-digsig-impair/west.console.txt
@@ -35,7 +35,7 @@ generating IKE_SA_INIT request 0 [ SA KE No N(NATD_S_IP) N(NATD_D_IP) N(FRAG_SUP
 sending packet: from 192.1.2.45[500] to 192.1.2.23[500] (XXX bytes)
 received packet: from 192.1.2.23[500] to 192.1.2.45[500] (XXX bytes)
 parsed IKE_SA_INIT response 0 [ N(INVAL_KE) ]
-peer didn't accept DH group CURVE_25519, it requested MODP_2048
+peer didn't accept DH group ECP_256, it requested MODP_2048
 initiating IKE_SA westnet-eastnet-ikev2[1] to 192.1.2.23
 generating IKE_SA_INIT request 0 [ SA KE No N(NATD_S_IP) N(NATD_D_IP) N(FRAG_SUP) N(HASH_ALG) N(REDIR_SUP) ]
 sending packet: from 192.1.2.45[500] to 192.1.2.23[500] (XXX bytes)

diff --git a/testing/pluto/interop-ikev2-strongswan-41-responder-digsig-rsa-pss-256/description.txt b/testing/pluto/interop-ikev2-strongswan-41-responder-digsig-rsa-pss-256/description.txt
@@ -0,0 +1,11 @@
+RFC 7427:
+Basic pluto with IKEv2 using X.509 on the initiator (west), and Strongswan on
+the responder (east) using Digital Signature Authentication.
+
+This is the reverse test of interop-ikev2-strongswan-05
+
+By default the Authentication method now is Digital Signatures.
+We currently supoort RSA-PSS with SHA2 (SHA2_256,SHA2_384 and SHA2_512)
+
+This testcase tests the auth scheme with rsa-sha2 (rsa-sha2_256)
+
diff --git a/testing/pluto/interop-ikev2-strongswan-41-responder-digsig-rsa-pss-256/east.conf b/testing/pluto/interop-ikev2-strongswan-41-responder-digsig-rsa-pss-256/east.conf
@@ -0,0 +1,29 @@
+# /etc/ipsec.conf - Strongswan IPsec configuration file
+
+config setup
+	# setup items now go into strongswan.conf for version 5+
+
+conn westnet-eastnet-ikev2
+	authby=rsasig
+	leftauth=ike:rsa/pss-sha256
+	rightauth=ike:rsa/pss-sha256
+	#auto=start
+	left=192.1.2.45
+	leftsubnet=192.0.1.0/24
+	leftrsasigkey=%cert
+	leftcert=/etc/strongswan/ipsec.d/certs/west.crt
+	leftsendcert=never
+	leftid="C=CA, ST=Ontario, O=Libreswan, OU=Test Department, CN=west.testing.libreswan.org, E=testing.libreswan.org"
+	right=192.1.2.23
+	rightsubnet=192.0.2.0/24
+	rightrsasigkey=%cert
+	rightcert=/etc/strongswan/ipsec.d/certs/east.crt
+	rightsendcert=never
+	rightid="C=CA/ST=Ontario/O=Libreswan/OU=Test Department/CN=east.testing.libreswan.org/E=testing.libreswan.org"
+	# strongswan options
+	keyexchange=ikev2
+	auto=add
+	fragmentation=yes
+
+#strongswan cannot include this, due to incompatible options
+#include	/testing/baseconfigs/all/etc/ipsec.d/ipsec.conf.common
diff --git a/testing/pluto/interop-ikev2-strongswan-41-responder-digsig-rsa-pss-256/east.console.txt b/testing/pluto/interop-ikev2-strongswan-41-responder-digsig-rsa-pss-256/east.console.txt
@@ -0,0 +1,20 @@
+/testing/guestbin/swan-prep --userland strongswan --x509
+east #
+ ../../pluto/bin/strongswan-start.sh
+east #
+ echo "initdone"
+initdone
+east #
+ if [ -f /var/run/pluto/pluto.pid ]; then ../../pluto/bin/ipsec-look.sh ; fi
+east #
+ if [ -f /var/run/charon.pid ]; then strongswan status ; fi
+Security Associations (1 up, 0 connecting):
+westnet-eastnet-ikev2[2]: ESTABLISHED XXX second ago, 192.1.2.23[C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=east.testing.libreswan.org, E=user-east@testing.libreswan.org]...192.1.2.45[C=CA, ST=Ontario, L=Toronto, O=Libreswan, OU=Test Department, CN=west.testing.libreswan.org, E=user-west@testing.libreswan.org]
+westnet-eastnet-ikev2{1}:  INSTALLED, TUNNEL, reqid 1, ESP SPIs: SPISPI_i SPISPI_o
+westnet-eastnet-ikev2{1}:   192.0.2.0/24 === 192.0.1.0/24
+east #
+east #
+ ../bin/check-for-core.sh
+east #
+ if [ -f /sbin/ausearch ]; then ausearch -r -m avc -ts recent ; fi
+