summaryrefslogtreecommitdiff
path: root/regress/sbin/ipsecctl/ike34.ok
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2012-09-17 20:40:50 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2012-09-17 20:40:50 +0000
commit2b7a5c358870817d18a452b0676d88d9ba98c567 (patch)
tree07440a8ab7ea57237fa01a4384a8163195c53039 /regress/sbin/ipsecctl/ike34.ok
parent752fa1cc83f784cf43ad570b1a443c92d5d84021 (diff)
sync with transform-name-fix
Diffstat (limited to 'regress/sbin/ipsecctl/ike34.ok')
-rw-r--r--regress/sbin/ipsecctl/ike34.ok28
1 files changed, 14 insertions, 14 deletions
diff --git a/regress/sbin/ipsecctl/ike34.ok b/regress/sbin/ipsecctl/ike34.ok
index ec8c1b60f07..f01eab50f01 100644
--- a/regress/sbin/ipsecctl/ike34.ok
+++ b/regress/sbin/ipsecctl/ike34.ok
@@ -3,13 +3,13 @@ C set [peer-1.2.3.4]:Phase=1 force
C set [peer-1.2.3.4]:Address=1.2.3.4 force
C set [peer-1.2.3.4]:Configuration=phase1-peer-1.2.3.4 force
C set [phase1-peer-1.2.3.4]:EXCHANGE_TYPE=ID_PROT force
-C add [phase1-peer-1.2.3.4]:Transforms=phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128,128:256-MODP_1024 force
-C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128,128:256-MODP_1024]:AUTHENTICATION_METHOD=RSA_SIG force
-C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128,128:256-MODP_1024]:HASH_ALGORITHM=SHA force
-C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128,128:256-MODP_1024]:ENCRYPTION_ALGORITHM=AES_CBC force
-C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128,128:256-MODP_1024]:KEY_LENGTH=128,128:256 force
-C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128,128:256-MODP_1024]:GROUP_DESCRIPTION=MODP_1024 force
-C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128,128:256-MODP_1024]:Life=LIFE_MAIN_MODE force
+C add [phase1-peer-1.2.3.4]:Transforms=phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128-MODP_1024 force
+C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128-MODP_1024]:AUTHENTICATION_METHOD=RSA_SIG force
+C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128-MODP_1024]:HASH_ALGORITHM=SHA force
+C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128-MODP_1024]:ENCRYPTION_ALGORITHM=AES_CBC force
+C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128-MODP_1024]:KEY_LENGTH=128,128:256 force
+C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128-MODP_1024]:GROUP_DESCRIPTION=MODP_1024 force
+C set [phase1-transform-peer-1.2.3.4-RSA_SIG-SHA-AES128-MODP_1024]:Life=LIFE_MAIN_MODE force
C set [from-3ffe::1/24-to-3ffe:2::/24]:Phase=2 force
C set [from-3ffe::1/24-to-3ffe:2::/24]:ISAKMP-peer=peer-1.2.3.4 force
C set [from-3ffe::1/24-to-3ffe:2::/24]:Configuration=phase2-from-3ffe::1/24-to-3ffe:2::/24 force
@@ -19,13 +19,13 @@ C set [phase2-from-3ffe::1/24-to-3ffe:2::/24]:EXCHANGE_TYPE=QUICK_MODE force
C set [phase2-from-3ffe::1/24-to-3ffe:2::/24]:Suites=phase2-suite-from-3ffe::1/24-to-3ffe:2::/24 force
C set [phase2-suite-from-3ffe::1/24-to-3ffe:2::/24]:Protocols=phase2-protocol-from-3ffe::1/24-to-3ffe:2::/24 force
C set [phase2-protocol-from-3ffe::1/24-to-3ffe:2::/24]:PROTOCOL_ID=IPSEC_ESP force
-C set [phase2-protocol-from-3ffe::1/24-to-3ffe:2::/24]:Transforms=phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128,128:256-SHA2_256-MODP_1024-TUNNEL force
-C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128,128:256-SHA2_256-MODP_1024-TUNNEL]:TRANSFORM_ID=AES force
-C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128,128:256-SHA2_256-MODP_1024-TUNNEL]:KEY_LENGTH=128,128:256 force
-C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128,128:256-SHA2_256-MODP_1024-TUNNEL]:ENCAPSULATION_MODE=TUNNEL force
-C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128,128:256-SHA2_256-MODP_1024-TUNNEL]:AUTHENTICATION_ALGORITHM=HMAC_SHA2_256 force
-C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128,128:256-SHA2_256-MODP_1024-TUNNEL]:GROUP_DESCRIPTION=MODP_1024 force
-C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128,128:256-SHA2_256-MODP_1024-TUNNEL]:Life=LIFE_QUICK_MODE force
+C set [phase2-protocol-from-3ffe::1/24-to-3ffe:2::/24]:Transforms=phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128-SHA2_256-MODP_1024-TUNNEL force
+C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128-SHA2_256-MODP_1024-TUNNEL]:TRANSFORM_ID=AES force
+C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128-SHA2_256-MODP_1024-TUNNEL]:KEY_LENGTH=128,128:256 force
+C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128-SHA2_256-MODP_1024-TUNNEL]:ENCAPSULATION_MODE=TUNNEL force
+C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128-SHA2_256-MODP_1024-TUNNEL]:AUTHENTICATION_ALGORITHM=HMAC_SHA2_256 force
+C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128-SHA2_256-MODP_1024-TUNNEL]:GROUP_DESCRIPTION=MODP_1024 force
+C set [phase2-transform-from-3ffe::1/24-to-3ffe:2::/24-AES128-SHA2_256-MODP_1024-TUNNEL]:Life=LIFE_QUICK_MODE force
C set [from-3ffe::1/24]:ID-type=IPV6_ADDR_SUBNET force
C set [from-3ffe::1/24]:Network=3ffe::1 force
C set [from-3ffe::1/24]:Netmask=ffff:ff00:: force