src - OpenBSD base system

diff options


context:
space:
mode:

author	Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org>	2006-05-27 17:22:21 +0000
committer	Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org>	2006-05-27 17:22:21 +0000
commit	2522b05e1ab25896a635f70e50696ab2cf6ee9f2 (patch)
tree	adc4f86533dcad2aebdb1d23135e2f47b1a8832e
parent	0539e0af48cb342240e4f31544abc301de2b3c64 (diff)

adopt to recent changes

Diffstat

-rw-r--r--

regress/sbin/ipsecctl/ike1.ok

-rw-r--r--

regress/sbin/ipsecctl/ike10.ok

-rw-r--r--

regress/sbin/ipsecctl/ike11.ok

-rw-r--r--

regress/sbin/ipsecctl/ike2.ok

-rw-r--r--

regress/sbin/ipsecctl/ike3.ok

-rw-r--r--

regress/sbin/ipsecctl/ike4.ok

-rw-r--r--

regress/sbin/ipsecctl/ike5.in

-rw-r--r--

regress/sbin/ipsecctl/ike5.ok

-rw-r--r--

regress/sbin/ipsecctl/ike6.ok

-rw-r--r--

regress/sbin/ipsecctl/ike7.ok

-rw-r--r--

regress/sbin/ipsecctl/ike8.ok

-rw-r--r--

regress/sbin/ipsecctl/ike9.ok

12 files changed, 34 insertions, 34 deletions

diff --git a/regress/sbin/ipsecctl/ike1.ok b/regress/sbin/ipsecctl/ike1.ok
index 6dd25d7df47..b6e3e1f937b 100644
--- a/regress/sbin/ipsecctl/ike1.ok
+++ b/regress/sbin/ipsecctl/ike1.ok

@@ -3,14 +3,14 @@ C set [peer-131.188.33.29]:Phase=1 force

C set [peer-131.188.33.29]:Address=131.188.33.29 force

C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force

C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-131.188.33.29]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-131.188.33.29]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [IPsec-131.188.33.51-131.188.33.29]:Phase=2 force

C set [IPsec-131.188.33.51-131.188.33.29]:ISAKMP-peer=peer-131.188.33.29 force

C set [IPsec-131.188.33.51-131.188.33.29]:Configuration=qm-131.188.33.51-131.188.33.29 force

C set [IPsec-131.188.33.51-131.188.33.29]:Local-ID=lid-131.188.33.51 force

C set [IPsec-131.188.33.51-131.188.33.29]:Remote-ID=rid-131.188.33.29 force

C set [qm-131.188.33.51-131.188.33.29]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-131.188.33.51-131.188.33.29]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-131.188.33.51-131.188.33.29]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-131.188.33.51]:ID-type=IPV4_ADDR force

C set [lid-131.188.33.51]:Address=131.188.33.51 force

C set [rid-131.188.33.29]:ID-type=IPV4_ADDR force

diff --git a/regress/sbin/ipsecctl/ike10.ok b/regress/sbin/ipsecctl/ike10.ok
index f85b51d3de8..a5489fcb0d2 100644
--- a/regress/sbin/ipsecctl/ike10.ok
+++ b/regress/sbin/ipsecctl/ike10.ok

@@ -3,14 +3,14 @@ C set [peer-192.168.200.1]:Phase=1 force

C set [peer-192.168.200.1]:Address=192.168.200.1 force

C set [peer-192.168.200.1]:Configuration=mm-192.168.200.1 force

C set [mm-192.168.200.1]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-192.168.200.1]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-192.168.200.1]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [IPsec-192.168.100.1-192.168.200.1]:Phase=2 force

C set [IPsec-192.168.100.1-192.168.200.1]:ISAKMP-peer=peer-192.168.200.1 force

C set [IPsec-192.168.100.1-192.168.200.1]:Configuration=qm-192.168.100.1-192.168.200.1 force

C set [IPsec-192.168.100.1-192.168.200.1]:Local-ID=lid-192.168.100.1 force

C set [IPsec-192.168.100.1-192.168.200.1]:Remote-ID=rid-192.168.200.1 force

C set [qm-192.168.100.1-192.168.200.1]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-192.168.100.1-192.168.200.1]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-192.168.100.1-192.168.200.1]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-192.168.100.1]:ID-type=IPV4_ADDR force

C set [lid-192.168.100.1]:Address=192.168.100.1 force

C set [rid-192.168.200.1]:ID-type=IPV4_ADDR force

diff --git a/regress/sbin/ipsecctl/ike11.ok b/regress/sbin/ipsecctl/ike11.ok
index 9e596e2fd1e..bd95ee22811 100644
--- a/regress/sbin/ipsecctl/ike11.ok
+++ b/regress/sbin/ipsecctl/ike11.ok

@@ -4,14 +4,14 @@ C set [peer-192.168.3.1]:Address=192.168.3.1 force

C set [peer-192.168.3.1:Local-address=192.168.3.2 force

C set [peer-192.168.3.1]:Configuration=mm-192.168.3.1 force

C set [mm-192.168.3.1]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-192.168.3.1]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-192.168.3.1]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Phase=2 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:ISAKMP-peer=peer-192.168.3.1 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Configuration=qm-1.1.1.1-0.0.0.0/0 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Local-ID=lid-1.1.1.1 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Remote-ID=rid-0.0.0.0/0 force

C set [qm-1.1.1.1-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-1.1.1.1-0.0.0.0/0]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-1.1.1.1-0.0.0.0/0]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-1.1.1.1]:ID-type=IPV4_ADDR force

C set [lid-1.1.1.1]:Address=1.1.1.1 force

C set [rid-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force

@@ -24,14 +24,14 @@ C set [peer-192.168.3.1]:Address=192.168.3.1 force

C set [peer-192.168.3.1:Local-address=192.168.3.2 force

C set [peer-192.168.3.1]:Configuration=mm-192.168.3.1 force

C set [mm-192.168.3.1]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-192.168.3.1]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-192.168.3.1]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Phase=2 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:ISAKMP-peer=peer-192.168.3.1 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Configuration=qm-1.1.1.1-0.0.0.0/0 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Local-ID=lid-1.1.1.1 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Remote-ID=rid-0.0.0.0/0 force

C set [qm-1.1.1.1-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-1.1.1.1-0.0.0.0/0]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-1.1.1.1-0.0.0.0/0]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-1.1.1.1]:ID-type=IPV4_ADDR force

C set [lid-1.1.1.1]:Address=1.1.1.1 force

C set [rid-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force

diff --git a/regress/sbin/ipsecctl/ike2.ok b/regress/sbin/ipsecctl/ike2.ok
index 6642e436d06..f4917d5d394 100644
--- a/regress/sbin/ipsecctl/ike2.ok
+++ b/regress/sbin/ipsecctl/ike2.ok

@@ -3,14 +3,14 @@ C set [peer-131.188.33.29]:Phase=1 force

C set [peer-131.188.33.29]:Address=131.188.33.29 force

C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force

C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-131.188.33.29]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-131.188.33.29]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Phase=2 force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:ISAKMP-peer=peer-131.188.33.29 force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Configuration=qm-10.1.1.0/24-10.1.2.0/24 force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Local-ID=lid-10.1.1.0/24 force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Remote-ID=rid-10.1.2.0/24 force

C set [qm-10.1.1.0/24-10.1.2.0/24]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-10.1.1.0/24-10.1.2.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-10.1.1.0/24-10.1.2.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-10.1.1.0/24]:ID-type=IPV4_ADDR_SUBNET force

C set [lid-10.1.1.0/24]:Network=10.1.1.0 force

C set [lid-10.1.1.0/24]:Netmask=255.255.255.0 force

diff --git a/regress/sbin/ipsecctl/ike3.ok b/regress/sbin/ipsecctl/ike3.ok
index 4dfa52eabe7..a84d2600514 100644
--- a/regress/sbin/ipsecctl/ike3.ok
+++ b/regress/sbin/ipsecctl/ike3.ok

@@ -3,7 +3,7 @@ C set [peer-131.188.33.29]:Phase=1 force

C set [peer-131.188.33.29]:Address=131.188.33.29 force

C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force

C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-131.188.33.29]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-131.188.33.29]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [peer-131.188.33.29]:ID=local-ID force

C set [local-ID]:ID-type=FQDN force

C set [local-ID]:Name=sharleena.as10.net force

@@ -16,7 +16,7 @@ C set [IPsec-131.188.33.51-131.188.33.29]:Configuration=qm-131.188.33.51-131.188

C set [IPsec-131.188.33.51-131.188.33.29]:Local-ID=lid-131.188.33.51 force

C set [IPsec-131.188.33.51-131.188.33.29]:Remote-ID=rid-131.188.33.29 force

C set [qm-131.188.33.51-131.188.33.29]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-131.188.33.51-131.188.33.29]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-131.188.33.51-131.188.33.29]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-131.188.33.51]:ID-type=IPV4_ADDR force

C set [lid-131.188.33.51]:Address=131.188.33.51 force

C set [rid-131.188.33.29]:ID-type=IPV4_ADDR force

diff --git a/regress/sbin/ipsecctl/ike4.ok b/regress/sbin/ipsecctl/ike4.ok
index cee9894a196..4ad2626bde1 100644
--- a/regress/sbin/ipsecctl/ike4.ok
+++ b/regress/sbin/ipsecctl/ike4.ok

@@ -3,7 +3,7 @@ C set [peer-131.188.33.29]:Phase=1 force

C set [peer-131.188.33.29]:Address=131.188.33.29 force

C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force

C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-131.188.33.29]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-131.188.33.29]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [peer-131.188.33.29]:ID=local-ID force

C set [local-ID]:ID-type=FQDN force

C set [local-ID]:Name=sharleena.as10.net force

@@ -16,7 +16,7 @@ C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Configuration=qm-10.1.1.0/24-10.1.2.0/24 f

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Local-ID=lid-10.1.1.0/24 force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Remote-ID=rid-10.1.2.0/24 force

C set [qm-10.1.1.0/24-10.1.2.0/24]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-10.1.1.0/24-10.1.2.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-10.1.1.0/24-10.1.2.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-10.1.1.0/24]:ID-type=IPV4_ADDR_SUBNET force

C set [lid-10.1.1.0/24]:Network=10.1.1.0 force

C set [lid-10.1.1.0/24]:Netmask=255.255.255.0 force

diff --git a/regress/sbin/ipsecctl/ike5.in b/regress/sbin/ipsecctl/ike5.in
index 8bcee20ec01..7a4c38a5d1f 100644
--- a/regress/sbin/ipsecctl/ike5.in
+++ b/regress/sbin/ipsecctl/ike5.in

@@ -1,8 +1,8 @@

ike esp from 10.1.1.0/24 to 10.1.2.0/24 peer 131.188.33.29 \

- main auth hmac-sha1 enc 3des \

- quick auth hmac-sha1 enc 3des \

+ main auth hmac-sha1 enc 3des group modp3072 \

+ quick auth hmac-sha1 enc 3des group modp3072 \

srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de

ike esp from 131.188.33.51 to 131.188.33.29 \

- main auth hmac-sha1 enc aes \

- quick auth hmac-sha2-256 enc aes \

+ main auth hmac-sha1 enc aes group modp3072 \

+ quick auth hmac-sha2-256 enc aes group modp3072 \

srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de

diff --git a/regress/sbin/ipsecctl/ike5.ok b/regress/sbin/ipsecctl/ike5.ok
index bab146642bc..ca626a7bfea 100644
--- a/regress/sbin/ipsecctl/ike5.ok
+++ b/regress/sbin/ipsecctl/ike5.ok

@@ -3,7 +3,7 @@ C set [peer-131.188.33.29]:Phase=1 force

C set [peer-131.188.33.29]:Address=131.188.33.29 force

C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force

C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-131.188.33.29]:Transforms=3DES-SHA-RSA_SIG force

+C add [mm-131.188.33.29]:Transforms=3DES-SHA-GRP15-RSA_SIG force

C set [peer-131.188.33.29]:ID=local-ID force

C set [local-ID]:ID-type=FQDN force

C set [local-ID]:Name=sharleena.as10.net force

@@ -16,7 +16,7 @@ C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Configuration=qm-10.1.1.0/24-10.1.2.0/24 f

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Local-ID=lid-10.1.1.0/24 force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Remote-ID=rid-10.1.2.0/24 force

C set [qm-10.1.1.0/24-10.1.2.0/24]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-10.1.1.0/24-10.1.2.0/24]:Suites=QM-ESP-3DES-SHA-PFS-SUITE force

+C set [qm-10.1.1.0/24-10.1.2.0/24]:Suites=QM-ESP-3DES-SHA-PFS-GRP15-SUITE force

C set [lid-10.1.1.0/24]:ID-type=IPV4_ADDR_SUBNET force

C set [lid-10.1.1.0/24]:Network=10.1.1.0 force

C set [lid-10.1.1.0/24]:Netmask=255.255.255.0 force

@@ -29,7 +29,7 @@ C set [peer-131.188.33.29]:Phase=1 force

C set [peer-131.188.33.29]:Address=131.188.33.29 force

C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force

C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-131.188.33.29]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-131.188.33.29]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [peer-131.188.33.29]:ID=local-ID force

C set [local-ID]:ID-type=FQDN force

C set [local-ID]:Name=sharleena.as10.net force

@@ -42,7 +42,7 @@ C set [IPsec-131.188.33.51-131.188.33.29]:Configuration=qm-131.188.33.51-131.188

C set [IPsec-131.188.33.51-131.188.33.29]:Local-ID=lid-131.188.33.51 force

C set [IPsec-131.188.33.51-131.188.33.29]:Remote-ID=rid-131.188.33.29 force

C set [qm-131.188.33.51-131.188.33.29]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-131.188.33.51-131.188.33.29]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-131.188.33.51-131.188.33.29]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-131.188.33.51]:ID-type=IPV4_ADDR force

C set [lid-131.188.33.51]:Address=131.188.33.51 force

C set [rid-131.188.33.29]:ID-type=IPV4_ADDR force

diff --git a/regress/sbin/ipsecctl/ike6.ok b/regress/sbin/ipsecctl/ike6.ok
index 6e46035c7c2..b13282f49f7 100644
--- a/regress/sbin/ipsecctl/ike6.ok
+++ b/regress/sbin/ipsecctl/ike6.ok

@@ -3,14 +3,14 @@ C set [peer-131.188.33.29]:Phase=1 force

C set [peer-131.188.33.29]:Address=131.188.33.29 force

C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force

C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-131.188.33.29]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-131.188.33.29]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Phase=2 force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:ISAKMP-peer=peer-131.188.33.29 force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Configuration=qm-10.1.1.0/24-10.1.2.0/24 force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Local-ID=lid-10.1.1.0/24 force

C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Remote-ID=rid-10.1.2.0/24 force

C set [qm-10.1.1.0/24-10.1.2.0/24]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-10.1.1.0/24-10.1.2.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-10.1.1.0/24-10.1.2.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-10.1.1.0/24]:ID-type=IPV4_ADDR_SUBNET force

C set [lid-10.1.1.0/24]:Network=10.1.1.0 force

C set [lid-10.1.1.0/24]:Netmask=255.255.255.0 force

@@ -23,14 +23,14 @@ C set [peer-131.188.33.29]:Phase=1 force

C set [peer-131.188.33.29]:Address=131.188.33.29 force

C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force

C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-131.188.33.29]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-131.188.33.29]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [IPsec-131.188.33.51-131.188.33.29]:Phase=2 force

C set [IPsec-131.188.33.51-131.188.33.29]:ISAKMP-peer=peer-131.188.33.29 force

C set [IPsec-131.188.33.51-131.188.33.29]:Configuration=qm-131.188.33.51-131.188.33.29 force

C set [IPsec-131.188.33.51-131.188.33.29]:Local-ID=lid-131.188.33.51 force

C set [IPsec-131.188.33.51-131.188.33.29]:Remote-ID=rid-131.188.33.29 force

C set [qm-131.188.33.51-131.188.33.29]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-131.188.33.51-131.188.33.29]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-131.188.33.51-131.188.33.29]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-131.188.33.51]:ID-type=IPV4_ADDR force

C set [lid-131.188.33.51]:Address=131.188.33.51 force

C set [rid-131.188.33.29]:ID-type=IPV4_ADDR force

diff --git a/regress/sbin/ipsecctl/ike7.ok b/regress/sbin/ipsecctl/ike7.ok
index a39f1b37ba5..0c4cf7ac7b3 100644
--- a/regress/sbin/ipsecctl/ike7.ok
+++ b/regress/sbin/ipsecctl/ike7.ok

@@ -3,14 +3,14 @@ C set [peer-131.188.33.51]:Phase=1 force

C set [peer-131.188.33.51]:Address=131.188.33.51 force

C set [peer-131.188.33.51]:Configuration=mm-131.188.33.51 force

C set [mm-131.188.33.51]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-131.188.33.51]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-131.188.33.51]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [IPsec-10.1.2.0/24-10.1.1.0/24]:Phase=2 force

C set [IPsec-10.1.2.0/24-10.1.1.0/24]:ISAKMP-peer=peer-131.188.33.51 force

C set [IPsec-10.1.2.0/24-10.1.1.0/24]:Configuration=qm-10.1.2.0/24-10.1.1.0/24 force

C set [IPsec-10.1.2.0/24-10.1.1.0/24]:Local-ID=lid-10.1.2.0/24 force

C set [IPsec-10.1.2.0/24-10.1.1.0/24]:Remote-ID=rid-10.1.1.0/24 force

C set [qm-10.1.2.0/24-10.1.1.0/24]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-10.1.2.0/24-10.1.1.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-10.1.2.0/24-10.1.1.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-10.1.2.0/24]:ID-type=IPV4_ADDR_SUBNET force

C set [lid-10.1.2.0/24]:Network=10.1.2.0 force

C set [lid-10.1.2.0/24]:Netmask=255.255.255.0 force

@@ -23,14 +23,14 @@ C set [peer-131.188.33.51]:Phase=1 force

C set [peer-131.188.33.51]:Address=131.188.33.51 force

C set [peer-131.188.33.51]:Configuration=mm-131.188.33.51 force

C set [mm-131.188.33.51]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-131.188.33.51]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-131.188.33.51]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [IPsec-131.188.33.29-131.188.33.51]:Phase=2 force

C set [IPsec-131.188.33.29-131.188.33.51]:ISAKMP-peer=peer-131.188.33.51 force

C set [IPsec-131.188.33.29-131.188.33.51]:Configuration=qm-131.188.33.29-131.188.33.51 force

C set [IPsec-131.188.33.29-131.188.33.51]:Local-ID=lid-131.188.33.29 force

C set [IPsec-131.188.33.29-131.188.33.51]:Remote-ID=rid-131.188.33.51 force

C set [qm-131.188.33.29-131.188.33.51]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-131.188.33.29-131.188.33.51]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-131.188.33.29-131.188.33.51]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-131.188.33.29]:ID-type=IPV4_ADDR force

C set [lid-131.188.33.29]:Address=131.188.33.29 force

C set [rid-131.188.33.51]:ID-type=IPV4_ADDR force

diff --git a/regress/sbin/ipsecctl/ike8.ok b/regress/sbin/ipsecctl/ike8.ok
index 45612b98e44..68717f64d10 100644
--- a/regress/sbin/ipsecctl/ike8.ok
+++ b/regress/sbin/ipsecctl/ike8.ok

@@ -3,14 +3,14 @@ C set [peer-192.168.3.1]:Phase=1 force

C set [peer-192.168.3.1]:Address=192.168.3.1 force

C set [peer-192.168.3.1]:Configuration=mm-192.168.3.1 force

C set [mm-192.168.3.1]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-192.168.3.1]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-192.168.3.1]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Phase=2 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:ISAKMP-peer=peer-192.168.3.1 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Configuration=qm-1.1.1.1-0.0.0.0/0 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Local-ID=lid-1.1.1.1 force

C set [IPsec-1.1.1.1-0.0.0.0/0]:Remote-ID=rid-0.0.0.0/0 force

C set [qm-1.1.1.1-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-1.1.1.1-0.0.0.0/0]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-1.1.1.1-0.0.0.0/0]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-1.1.1.1]:ID-type=IPV4_ADDR force

C set [lid-1.1.1.1]:Address=1.1.1.1 force

C set [rid-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force

diff --git a/regress/sbin/ipsecctl/ike9.ok b/regress/sbin/ipsecctl/ike9.ok
index e272233529a..b05a08dd34d 100644
--- a/regress/sbin/ipsecctl/ike9.ok
+++ b/regress/sbin/ipsecctl/ike9.ok

@@ -5,7 +5,7 @@ C set [peer-2.2.2.2]:Phase=1 force

C set [peer-2.2.2.2]:Address=2.2.2.2 force

C set [peer-2.2.2.2]:Configuration=mm-2.2.2.2 force

C set [mm-2.2.2.2]:EXCHANGE_TYPE=ID_PROT force

-C add [mm-2.2.2.2]:Transforms=AES-SHA-RSA_SIG force

+C add [mm-2.2.2.2]:Transforms=AES-SHA-GRP15-RSA_SIG force

C set [peer-2.2.2.2]:ID=local-ID force

C set [local-ID]:ID-type=FQDN force

C set [local-ID]:Name=noname.my.domain force

@@ -15,7 +15,7 @@ C set [IPsec-3.3.3.0/24-4.4.4.0/24]:Configuration=qm-3.3.3.0/24-4.4.4.0/24 force

C set [IPsec-3.3.3.0/24-4.4.4.0/24]:Local-ID=lid-3.3.3.0/24 force

C set [IPsec-3.3.3.0/24-4.4.4.0/24]:Remote-ID=rid-4.4.4.0/24 force

C set [qm-3.3.3.0/24-4.4.4.0/24]:EXCHANGE_TYPE=QUICK_MODE force

-C set [qm-3.3.3.0/24-4.4.4.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-SUITE force

+C set [qm-3.3.3.0/24-4.4.4.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force

C set [lid-3.3.3.0/24]:ID-type=IPV4_ADDR_SUBNET force

C set [lid-3.3.3.0/24]:Network=3.3.3.0 force

C set [lid-3.3.3.0/24]:Netmask=255.255.255.0 force