summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2000-07-18 14:56:42 +0000
committeritojun <itojun@NetBSD.org>2000-07-18 14:56:42 +0000
commit65d37eff7f56dfddf765f2e596abc63e19942497 (patch)
tree1e90c1940e3edede9d55420d026734ce50d41273 /sys/net
parent905b4e497fca3cce743c477ac5479de9970ca8e0 (diff)
correct RFC2367 PF_KEY conformance (SADB_[AE]ALG_xx values and namespaces).
sync from kame. WARNING: need recompilation of setkey(8) and pkgsrc/security/racoon. (no ipsec-ready netbsd was released as official release)
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/pfkeyv2.h45
1 files changed, 24 insertions, 21 deletions
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h
index 2fa6d086feb..50832447e5c 100644
--- a/sys/net/pfkeyv2.h
+++ b/sys/net/pfkeyv2.h
@@ -1,5 +1,5 @@
-/* $NetBSD: pfkeyv2.h,v 1.6 2000/07/01 01:01:34 itojun Exp $ */
-/* $KAME: pfkeyv2.h,v 1.17 2000/06/22 08:38:33 sakane Exp $ */
+/* $NetBSD: pfkeyv2.h,v 1.7 2000/07/18 14:56:42 itojun Exp $ */
+/* $KAME: pfkeyv2.h,v 1.18 2000/07/15 16:07:47 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -298,26 +298,29 @@ struct sadb_x_ipsecrequest {
#define SADB_SAFLAGS_PFS 1
-#define SADB_AALG_NONE 0
-#define SADB_AALG_MD5HMAC 1 /* 2 */
-#define SADB_AALG_SHA1HMAC 2 /* 3 */
-#define SADB_AALG_MD5 3 /* Keyed MD5 */
-#define SADB_AALG_SHA 4 /* Keyed SHA */
-#define SADB_AALG_NULL 5 /* null authentication */
-#define SADB_AALG_MAX 6
-
-#define SADB_EALG_NONE 0
-#define SADB_EALG_DESCBC 1 /* 2 */
-#define SADB_EALG_3DESCBC 2 /* 3 */
-#define SADB_EALG_NULL 3 /* 11 */
-#define SADB_EALG_BLOWFISHCBC 4
-#define SADB_EALG_CAST128CBC 5
-#if 0
-#define SADB_EALG_RC5CBC 6
-#define SADB_EALG_MAX 7
-#else
-#define SADB_EALG_MAX 6
+/* RFC2367 numbers - meets RFC2407 */
+#define SADB_AALG_NONE 0
+#define SADB_AALG_MD5HMAC 2
+#define SADB_AALG_SHA1HMAC 3
+#define SADB_AALG_MAX 251
+/* private allocations should use 249-255 (RFC2407) */
+#define SADB_X_AALG_MD5 249 /* Keyed MD5 */
+#define SADB_X_AALG_SHA 250 /* Keyed SHA */
+#define SADB_X_AALG_NULL 251 /* null authentication */
+
+/* RFC2367 numbers - meets RFC2407 */
+#define SADB_EALG_NONE 0
+#define SADB_EALG_DESCBC 2
+#define SADB_EALG_3DESCBC 3
+#define SADB_EALG_NULL 11
+#define SADB_EALG_MAX 11
+/* private allocations - based on RFC2407 */
+#if 0 /*disabled due to possible patent issue*/
+#define SADB_X_EALG_RC5CBC 4
#endif
+#define SADB_X_EALG_CAST128CBC 6
+#define SADB_X_EALG_BLOWFISHCBC 7
+/* private allocations should use 249-255 (RFC2407) */
#if 1 /*nonstandard */
#define SADB_X_CALG_NONE 0