Update with some data for NAT-T specific payload types, IKEv2

notifications, ISAKMP EAP code and types, plus fix an old typo.

1 files changed, 64 insertions, 5 deletions

diff --git a/sbin/isakmpd/isakmp_num.cst b/sbin/isakmpd/isakmp_num.cst
index 80ea9015f77..31e00b8bb4e 100644
--- a/sbin/isakmpd/isakmp_num.cst
+++ b/sbin/isakmpd/isakmp_num.cst
@@ -1,4 +1,4 @@
-#	$OpenBSD: isakmp_num.cst,v 1.5 2001/07/01 20:43:39 niklas Exp $
+#	$OpenBSD: isakmp_num.cst,v 1.6 2003/05/12 21:48:08 ho Exp $
 #	$EOM: isakmp_num.cst,v 1.3 2000/05/17 03:09:50 angelos Exp $
 
 #
@@ -56,8 +56,10 @@ ISAKMP_PAYLOAD
   DELETE			12
   VENDOR			13
 # XXX the following is not quite legitimate according to the IETF process
-  ATTRIBUTE			14
-  RESERVED_MIN			15
+  ATTRIBUTE			14	# IKE Mode-Config attribute
+  NAT_D				15	# NAT Discovery payload
+  NAT_OA			16	# NAT Original Address payload
+  RESERVED_MIN			15	# XXX Change to 17 to accept NAT-T
   RESERVED_MAX			127
   PRIVATE_MIN			128
   PRIVATE_MAX			255
@@ -100,7 +102,9 @@ ISAKMP_CERTENC
   SPKI				9
   X509_ATTR			10
   KEYNOTE			11
-  RESERVED_MIN			12
+  HASH_URL_PKIX_CERT		12
+  HASH_URL_PKIX_BUNDLE		13
+  RESERVED_MIN			14
   RESERVED_MAX			255
 .
 
@@ -143,7 +147,7 @@ ISAKMP_NOTIFY
   STATUS_CONNECTED		16384
   STATUS_RESERVED1_MIN		16385
   STATUS_RESERVED1_MAX		24575
-  STATUS_DOI_MIN		12576
+  STATUS_DOI_MIN		24576
   STATUS_DOI_MAX		32767
   STATUS_PRIVATE_MIN		32768
   STATUS_PRIVATE_MAX		40959
@@ -151,6 +155,42 @@ ISAKMP_NOTIFY
   STATUS_RESERVED2_MAX		65535
 .
 
+# ISAKMP V2 Notify payload types
+ISAKMP_V2_NOTIFY
+  UNSUPPORTED_CRITICAL_PAYLOAD		1
+  INVALID_IKE_SPI			4
+  INVALID_MAJOR_VERSION			5
+  INVALID_SYNTAX			7
+  INVALID_MESSAGE_ID			9
+  INVALID_SPI				11
+  NO_PROPOSAL_CHOSEN			14
+  AUTHENTICATION_FAILED			24
+  SINGLE_PAIR_REQUIRED			34
+  NO_ADDITIONAL_SAS			35
+  INTERNAL_ADDRESS_FAILURE		36
+  FAILED_CP_REQUIRED			37
+  TS_UNACCEPTABLE			38
+  RESERVED_MIN				39
+  RESERVED_MAX				8191
+  PRIVATE_MIN				8192
+  PRIVATE_MAX				16383
+  STATUS_RESERVED1_MIN			16384
+  STATUS_RESERVED1_MAX			24577
+  STATUS_INITIAL_CONTACT		24578
+  STATUS_SET_WINDOW_SIZE		24579
+  STATUS_ADDITIONAL_IS_POSSIBLE		24580
+  STATUS_IPCOMP_SUPPORTED		24581
+  STATUS_NAT_DETECTION_SOURCE_IP	24582
+  STATUS_NAT_DETECTION_DESTINATION_IP	24583
+  STATUS_COOKIE				24584
+  STATUS_USE_TRANSPORT_MODE		24585
+  STATUS_HTTP_CERT_LOOKUP_SUPPORTED	24586
+  STATUS_RESERVED2_MIN			24587
+  STATUS_RESERVED2_MAX			40959
+  STATUS_PRIVATE_MIN			40960
+  STATUS_PRIVATE_MAX			65535
+.
+
 # ISAKMP DOI Identifier.
 ISAKMP_DOI
   ISAKMP		0
@@ -195,3 +235,22 @@ ISAKMP_CFG_ATTR
   PRIVATE_MIN			16384
   PRIVATE_MAX			32767
 .
+
+# ISAKMP EAP
+ISAKMP_EAP_CODE
+  REQUEST			1
+  RESPONSE			2
+  SUCCESS			3
+  FAILURE			4
+.
+
+# ISAKMP EAP Types (RFC2284)
+ISAKMP_EAP_TYPE
+  IDENTITY			1
+  NOTIFICATION			2
+  NAK				3	# Response only
+  MD5_CHALLENGE			4
+  OTP				5
+  TOKEN				6	# Generic token card
+.
+