diff options
| author | ume <ume@FreeBSD.org> | 2002-10-15 20:59:56 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2002-10-15 20:59:56 +0000 |
| commit | 722fa29f92f41d277c6fea2bb9c5df8a775ed344 (patch) | |
| tree | ee8b99d4f38e72e497fd76ceb1c644757e3d3228 /sys/net/pfkeyv2.h | |
| parent | 14a1082c5141debc49a9841bd9d46611eb3cb5a6 (diff) | |
| download | FreeBSD-src-722fa29f92f41d277c6fea2bb9c5df8a775ed344.zip FreeBSD-src-722fa29f92f41d277c6fea2bb9c5df8a775ed344.tar.gz | |
Correct the definitions of SADB_* to be compatible with
RFC2407/IANA assignment. This change breaks binary
compatibility. So, you need to recompile IPsec related
applications.
Diffstat (limited to 'sys/net/pfkeyv2.h')
| -rw-r--r-- | sys/net/pfkeyv2.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h index 1c1952c..63830c9 100644 --- a/sys/net/pfkeyv2.h +++ b/sys/net/pfkeyv2.h @@ -287,7 +287,7 @@ struct sadb_x_ipsecrequest { #define SADB_SATYPE_RIPV2 7 #define SADB_SATYPE_MIP 8 #define SADB_X_SATYPE_IPCOMP 9 -#define SADB_X_SATYPE_POLICY 10 +/*#define SADB_X_SATYPE_POLICY 10 obsolete, do not reuse */ #define SADB_SATYPE_MAX 11 #define SADB_SASTATE_LARVAL 0 @@ -300,27 +300,27 @@ struct sadb_x_ipsecrequest { /* RFC2367 numbers - meets RFC2407 */ #define SADB_AALG_NONE 0 -#define SADB_AALG_MD5HMAC 1 /*2*/ -#define SADB_AALG_SHA1HMAC 2 /*3*/ -#define SADB_AALG_MAX 8 +#define SADB_AALG_MD5HMAC 2 +#define SADB_AALG_SHA1HMAC 3 +#define SADB_AALG_MAX 251 /* private allocations - based on RFC2407/IANA assignment */ -#define SADB_X_AALG_SHA2_256 6 /*5*/ -#define SADB_X_AALG_SHA2_384 7 /*6*/ -#define SADB_X_AALG_SHA2_512 8 /*7*/ +#define SADB_X_AALG_SHA2_256 5 +#define SADB_X_AALG_SHA2_384 6 +#define SADB_X_AALG_SHA2_512 7 /* private allocations should use 249-255 (RFC2407) */ -#define SADB_X_AALG_MD5 3 /*249*/ /* Keyed MD5 */ -#define SADB_X_AALG_SHA 4 /*250*/ /* Keyed SHA */ -#define SADB_X_AALG_NULL 5 /*251*/ /* null authentication */ +#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 1 /*2*/ -#define SADB_EALG_3DESCBC 2 /*3*/ -#define SADB_EALG_NULL 3 /*11*/ +#define SADB_EALG_DESCBC 2 +#define SADB_EALG_3DESCBC 3 +#define SADB_EALG_NULL 11 #define SADB_EALG_MAX 12 /* private allocations - based on RFC2407/IANA assignment */ -#define SADB_X_EALG_CAST128CBC 5 /*6*/ -#define SADB_X_EALG_BLOWFISHCBC 4 /*7*/ +#define SADB_X_EALG_CAST128CBC 6 +#define SADB_X_EALG_BLOWFISHCBC 7 #define SADB_X_EALG_RIJNDAELCBC 12 #define SADB_X_EALG_AES 12 /* private allocations should use 249-255 (RFC2407) */ |
