summaryrefslogtreecommitdiff
path: root/testing/tests/ikev1/xauth-rsa-nosecret/description.txt
diff options
context:
space:
mode:
Diffstat (limited to 'testing/tests/ikev1/xauth-rsa-nosecret/description.txt')
-rw-r--r--testing/tests/ikev1/xauth-rsa-nosecret/description.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/testing/tests/ikev1/xauth-rsa-nosecret/description.txt b/testing/tests/ikev1/xauth-rsa-nosecret/description.txt
index ffbb47c04..00ef6927c 100644
--- a/testing/tests/ikev1/xauth-rsa-nosecret/description.txt
+++ b/testing/tests/ikev1/xauth-rsa-nosecret/description.txt
@@ -2,5 +2,9 @@ The roadwarrior <b>carol</b> sets up a connection to gateway <b>moon</b>.
The authentication is based on RSA signatures (<b>RSASIG</b>) using X.509
certificates followed by extended authentication (<b>XAUTH</b>) based
on user name and password. Because user <b>carol</b> cannot find her
+<<<<<<< HEAD
XAUTH credentials in ipsec.secrets, the IKE negotation is aborted and the
+=======
+XAUTH credentials in ipsec.secrets, the IKE negotiation is aborted and the
+>>>>>>> upstream/4.5.1
ISAKMP SA is deleted.