summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/ipsec/attributes.conf20
-rw-r--r--share/ipsec/secrets.conf2
2 files changed, 10 insertions, 12 deletions
diff --git a/share/ipsec/attributes.conf b/share/ipsec/attributes.conf
index 792e860c544..ad1c139f10c 100644
--- a/share/ipsec/attributes.conf
+++ b/share/ipsec/attributes.conf
@@ -1,16 +1,16 @@
-# Accepted keywords are AT_AH_ATTRIB, AT_ESP_ATTRIB, AT_MD5_DP, AT_MD5_KDP
-# AT_DES_CBC
-# More attributes will be supported later.
-# AT_MP5_DP must be offered and also at least one
-# of AT_ESP_ATTRIB or AT_AH_ATTRIB
+# Predefined keywords are AT_AH_ATTRIB, AT_ESP_ATTRIB
+# Not yet defined keywords serve as definitions with the
+# following syntax: name, photuris id, type, key length
# This is the default list
-AT_MD5_DP
+AT_SHA1_IPMAC, 6, ident|auth, 48
+AT_MD5_IPMAC, 5, ident|auth, 48
AT_ESP_ATTRIB
-AT_DES_CBC
+ AT_DES_CBC, 8, enc, 8
AT_AH_ATTRIB
-AT_MD5_KDP
+ AT_MD5_IPMAC
+ AT_SHA1_IPMAC
# This is the list for 134.100.104
134.100.104.0 255.255.255.0
-AT_MD5_DP
+AT_MD5_IPMAC
AT_AH_ATTRIB
-AT_MD5_KDP
+ AT_MD5_IPMAC
diff --git a/share/ipsec/secrets.conf b/share/ipsec/secrets.conf
index 05bd2d7f0e3..5099979570b 100644
--- a/share/ipsec/secrets.conf
+++ b/share/ipsec/secrets.conf
@@ -15,5 +15,3 @@ identity remote "Niels" "Niels for one"
identity remote "Baker" "one for all"
identity remote "Baker-Apple" "Baker to Apple"
identity remote "Apple-Apple" "Apple to Apple"
-# Users
-identity lookup "Niels Provos:" provos