summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2009-01-19 13:44:37 +0000
committerHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2009-01-19 13:44:37 +0000
commitbf1ca0466429f3fec0f0f2e2d7fc4b9dec2902bf (patch)
treebab5df2a8dc8701fb7c40cec654d0ff9d58fc554 /regress
parent1c1e5c1ff0e397994c342112ec010936aa276e36 (diff)
Do not use "egress" keyword as it expands to an actual interface,
which might be different on different machines. Use some fixed addresses instead. pointed out and ok david@
Diffstat (limited to 'regress')
-rw-r--r--regress/sbin/ipsecctl/ike60.in6
-rw-r--r--regress/sbin/ipsecctl/ike60.ok114
2 files changed, 33 insertions, 87 deletions
diff --git a/regress/sbin/ipsecctl/ike60.in b/regress/sbin/ipsecctl/ike60.in
index 11d3b51077e..6e29f82a6a5 100644
--- a/regress/sbin/ipsecctl/ike60.in
+++ b/regress/sbin/ipsecctl/ike60.in
@@ -1,3 +1,3 @@
-ike from egress to any main enc aes-128 quick enc aes-128
-ike from egress to any main enc aes-192 quick enc aes-192
-ike from egress to any main enc aes-256 quick enc aes-256
+ike from 10.0.0.1 to any main enc aes-128 quick enc aes-128
+ike from 10.0.0.2 to any main enc aes-192 quick enc aes-192
+ike from 10.0.0.3 to any main enc aes-256 quick enc aes-256
diff --git a/regress/sbin/ipsecctl/ike60.ok b/regress/sbin/ipsecctl/ike60.ok
index e9f653d90d9..2d0b5724e04 100644
--- a/regress/sbin/ipsecctl/ike60.ok
+++ b/regress/sbin/ipsecctl/ike60.ok
@@ -3,106 +3,52 @@ C set [peer-default]:Phase=1 force
C set [peer-default]:Configuration=phase1-peer-default force
C set [phase1-peer-default]:EXCHANGE_TYPE=ID_PROT force
C add [phase1-peer-default]:Transforms=AES-128-SHA-RSA_SIG force
-C set [from-sk0-to-0.0.0.0/0]:Phase=2 force
-C set [from-sk0-to-0.0.0.0/0]:ISAKMP-peer=peer-default force
-C set [from-sk0-to-0.0.0.0/0]:Configuration=phase2-from-sk0-to-0.0.0.0/0 force
-C set [from-sk0-to-0.0.0.0/0]:Local-ID=from-sk0 force
-C set [from-sk0-to-0.0.0.0/0]:Remote-ID=to-0.0.0.0/0 force
-C set [phase2-from-sk0-to-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force
-C set [phase2-from-sk0-to-0.0.0.0/0]:Suites=QM-ESP-AES-128-SHA2-256-PFS-SUITE force
-C set [from-sk0]:ID-type=IPV4_ADDR force
-C set [from-sk0]:Address=sk0 force
+C set [from-10.0.0.1-to-0.0.0.0/0]:Phase=2 force
+C set [from-10.0.0.1-to-0.0.0.0/0]:ISAKMP-peer=peer-default force
+C set [from-10.0.0.1-to-0.0.0.0/0]:Configuration=phase2-from-10.0.0.1-to-0.0.0.0/0 force
+C set [from-10.0.0.1-to-0.0.0.0/0]:Local-ID=from-10.0.0.1 force
+C set [from-10.0.0.1-to-0.0.0.0/0]:Remote-ID=to-0.0.0.0/0 force
+C set [phase2-from-10.0.0.1-to-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force
+C set [phase2-from-10.0.0.1-to-0.0.0.0/0]:Suites=QM-ESP-AES-128-SHA2-256-PFS-SUITE force
+C set [from-10.0.0.1]:ID-type=IPV4_ADDR force
+C set [from-10.0.0.1]:Address=10.0.0.1 force
C set [to-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force
C set [to-0.0.0.0/0]:Network=0.0.0.0 force
C set [to-0.0.0.0/0]:Netmask=0.0.0.0 force
-C add [Phase 2]:Connections=from-sk0-to-0.0.0.0/0
-C set [Phase 1]:Default=peer-default force
-C set [peer-default]:Phase=1 force
-C set [peer-default]:Configuration=phase1-peer-default force
-C set [phase1-peer-default]:EXCHANGE_TYPE=ID_PROT force
-C add [phase1-peer-default]:Transforms=AES-128-SHA-RSA_SIG force
-C set [from-sk0-to-0.0.0.0/0]:Phase=2 force
-C set [from-sk0-to-0.0.0.0/0]:ISAKMP-peer=peer-default force
-C set [from-sk0-to-0.0.0.0/0]:Configuration=phase2-from-sk0-to-0.0.0.0/0 force
-C set [from-sk0-to-0.0.0.0/0]:Local-ID=from-sk0 force
-C set [from-sk0-to-0.0.0.0/0]:Remote-ID=to-0.0.0.0/0 force
-C set [phase2-from-sk0-to-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force
-C set [phase2-from-sk0-to-0.0.0.0/0]:Suites=QM-ESP-AES-128-SHA2-256-PFS-SUITE force
-C set [from-sk0]:ID-type=IPV4_ADDR force
-C set [from-sk0]:Address=sk0 force
-C set [to-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force
-C set [to-0.0.0.0/0]:Network=0.0.0.0 force
-C set [to-0.0.0.0/0]:Netmask=0.0.0.0 force
-C add [Phase 2]:Connections=from-sk0-to-0.0.0.0/0
-C set [Phase 1]:Default=peer-default force
-C set [peer-default]:Phase=1 force
-C set [peer-default]:Configuration=phase1-peer-default force
-C set [phase1-peer-default]:EXCHANGE_TYPE=ID_PROT force
-C add [phase1-peer-default]:Transforms=AES-192-SHA-RSA_SIG force
-C set [from-sk0-to-0.0.0.0/0]:Phase=2 force
-C set [from-sk0-to-0.0.0.0/0]:ISAKMP-peer=peer-default force
-C set [from-sk0-to-0.0.0.0/0]:Configuration=phase2-from-sk0-to-0.0.0.0/0 force
-C set [from-sk0-to-0.0.0.0/0]:Local-ID=from-sk0 force
-C set [from-sk0-to-0.0.0.0/0]:Remote-ID=to-0.0.0.0/0 force
-C set [phase2-from-sk0-to-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force
-C set [phase2-from-sk0-to-0.0.0.0/0]:Suites=QM-ESP-AES-192-SHA2-256-PFS-SUITE force
-C set [from-sk0]:ID-type=IPV4_ADDR force
-C set [from-sk0]:Address=sk0 force
-C set [to-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force
-C set [to-0.0.0.0/0]:Network=0.0.0.0 force
-C set [to-0.0.0.0/0]:Netmask=0.0.0.0 force
-C add [Phase 2]:Connections=from-sk0-to-0.0.0.0/0
+C add [Phase 2]:Connections=from-10.0.0.1-to-0.0.0.0/0
C set [Phase 1]:Default=peer-default force
C set [peer-default]:Phase=1 force
C set [peer-default]:Configuration=phase1-peer-default force
C set [phase1-peer-default]:EXCHANGE_TYPE=ID_PROT force
C add [phase1-peer-default]:Transforms=AES-192-SHA-RSA_SIG force
-C set [from-sk0-to-0.0.0.0/0]:Phase=2 force
-C set [from-sk0-to-0.0.0.0/0]:ISAKMP-peer=peer-default force
-C set [from-sk0-to-0.0.0.0/0]:Configuration=phase2-from-sk0-to-0.0.0.0/0 force
-C set [from-sk0-to-0.0.0.0/0]:Local-ID=from-sk0 force
-C set [from-sk0-to-0.0.0.0/0]:Remote-ID=to-0.0.0.0/0 force
-C set [phase2-from-sk0-to-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force
-C set [phase2-from-sk0-to-0.0.0.0/0]:Suites=QM-ESP-AES-192-SHA2-256-PFS-SUITE force
-C set [from-sk0]:ID-type=IPV4_ADDR force
-C set [from-sk0]:Address=sk0 force
-C set [to-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force
-C set [to-0.0.0.0/0]:Network=0.0.0.0 force
-C set [to-0.0.0.0/0]:Netmask=0.0.0.0 force
-C add [Phase 2]:Connections=from-sk0-to-0.0.0.0/0
-C set [Phase 1]:Default=peer-default force
-C set [peer-default]:Phase=1 force
-C set [peer-default]:Configuration=phase1-peer-default force
-C set [phase1-peer-default]:EXCHANGE_TYPE=ID_PROT force
-C add [phase1-peer-default]:Transforms=AES-256-SHA-RSA_SIG force
-C set [from-sk0-to-0.0.0.0/0]:Phase=2 force
-C set [from-sk0-to-0.0.0.0/0]:ISAKMP-peer=peer-default force
-C set [from-sk0-to-0.0.0.0/0]:Configuration=phase2-from-sk0-to-0.0.0.0/0 force
-C set [from-sk0-to-0.0.0.0/0]:Local-ID=from-sk0 force
-C set [from-sk0-to-0.0.0.0/0]:Remote-ID=to-0.0.0.0/0 force
-C set [phase2-from-sk0-to-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force
-C set [phase2-from-sk0-to-0.0.0.0/0]:Suites=QM-ESP-AES-256-SHA2-256-PFS-SUITE force
-C set [from-sk0]:ID-type=IPV4_ADDR force
-C set [from-sk0]:Address=sk0 force
+C set [from-10.0.0.2-to-0.0.0.0/0]:Phase=2 force
+C set [from-10.0.0.2-to-0.0.0.0/0]:ISAKMP-peer=peer-default force
+C set [from-10.0.0.2-to-0.0.0.0/0]:Configuration=phase2-from-10.0.0.2-to-0.0.0.0/0 force
+C set [from-10.0.0.2-to-0.0.0.0/0]:Local-ID=from-10.0.0.2 force
+C set [from-10.0.0.2-to-0.0.0.0/0]:Remote-ID=to-0.0.0.0/0 force
+C set [phase2-from-10.0.0.2-to-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force
+C set [phase2-from-10.0.0.2-to-0.0.0.0/0]:Suites=QM-ESP-AES-192-SHA2-256-PFS-SUITE force
+C set [from-10.0.0.2]:ID-type=IPV4_ADDR force
+C set [from-10.0.0.2]:Address=10.0.0.2 force
C set [to-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force
C set [to-0.0.0.0/0]:Network=0.0.0.0 force
C set [to-0.0.0.0/0]:Netmask=0.0.0.0 force
-C add [Phase 2]:Connections=from-sk0-to-0.0.0.0/0
+C add [Phase 2]:Connections=from-10.0.0.2-to-0.0.0.0/0
C set [Phase 1]:Default=peer-default force
C set [peer-default]:Phase=1 force
C set [peer-default]:Configuration=phase1-peer-default force
C set [phase1-peer-default]:EXCHANGE_TYPE=ID_PROT force
C add [phase1-peer-default]:Transforms=AES-256-SHA-RSA_SIG force
-C set [from-sk0-to-0.0.0.0/0]:Phase=2 force
-C set [from-sk0-to-0.0.0.0/0]:ISAKMP-peer=peer-default force
-C set [from-sk0-to-0.0.0.0/0]:Configuration=phase2-from-sk0-to-0.0.0.0/0 force
-C set [from-sk0-to-0.0.0.0/0]:Local-ID=from-sk0 force
-C set [from-sk0-to-0.0.0.0/0]:Remote-ID=to-0.0.0.0/0 force
-C set [phase2-from-sk0-to-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force
-C set [phase2-from-sk0-to-0.0.0.0/0]:Suites=QM-ESP-AES-256-SHA2-256-PFS-SUITE force
-C set [from-sk0]:ID-type=IPV4_ADDR force
-C set [from-sk0]:Address=sk0 force
+C set [from-10.0.0.3-to-0.0.0.0/0]:Phase=2 force
+C set [from-10.0.0.3-to-0.0.0.0/0]:ISAKMP-peer=peer-default force
+C set [from-10.0.0.3-to-0.0.0.0/0]:Configuration=phase2-from-10.0.0.3-to-0.0.0.0/0 force
+C set [from-10.0.0.3-to-0.0.0.0/0]:Local-ID=from-10.0.0.3 force
+C set [from-10.0.0.3-to-0.0.0.0/0]:Remote-ID=to-0.0.0.0/0 force
+C set [phase2-from-10.0.0.3-to-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force
+C set [phase2-from-10.0.0.3-to-0.0.0.0/0]:Suites=QM-ESP-AES-256-SHA2-256-PFS-SUITE force
+C set [from-10.0.0.3]:ID-type=IPV4_ADDR force
+C set [from-10.0.0.3]:Address=10.0.0.3 force
C set [to-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force
C set [to-0.0.0.0/0]:Network=0.0.0.0 force
C set [to-0.0.0.0/0]:Netmask=0.0.0.0 force
-C add [Phase 2]:Connections=from-sk0-to-0.0.0.0/0
+C add [Phase 2]:Connections=from-10.0.0.3-to-0.0.0.0/0