diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2015-04-17 10:04:38 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2015-04-17 10:04:38 +0000 |
| commit | 8e25766fd4b37b6b5b5d1ec351e92d40b0891046 (patch) | |
| tree | f88807e8c0391b8282ec1dcf95820ede68cd8930 /sys | |
| parent | fc84395d2c13aa9e223d33eeb142647ec9368565 (diff) | |
Remove unsupported SADB_X_IDENTTYPE_CONNECTION; OK markus, hshoexer
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/pfkeyv2.h | 5 | ||||
| -rw-r--r-- | sys/net/pfkeyv2_convert.c | 8 | ||||
| -rw-r--r-- | sys/netinet/ip_ipsp.h | 3 |
3 files changed, 4 insertions, 12 deletions
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h index e7e87b27786..8e96f0c51b1 100644 --- a/sys/net/pfkeyv2.h +++ b/sys/net/pfkeyv2.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2.h,v 1.67 2015/04/16 19:18:10 markus Exp $ */ +/* $OpenBSD: pfkeyv2.h,v 1.68 2015/04/17 10:04:37 mikeb Exp $ */ /* * @(#)COPYRIGHT 1.1 (NRL) January 1998 * @@ -333,8 +333,7 @@ struct sadb_x_tap { #define SADB_IDENTTYPE_PREFIX 1 #define SADB_IDENTTYPE_FQDN 2 #define SADB_IDENTTYPE_USERFQDN 3 -#define SADB_X_IDENTTYPE_CONNECTION 4 -#define SADB_IDENTTYPE_MAX 4 +#define SADB_IDENTTYPE_MAX 3 #define SADB_KEY_FLAGS_MAX 0 diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c index 1de21367eb4..9fa4920c40f 100644 --- a/sys/net/pfkeyv2_convert.c +++ b/sys/net/pfkeyv2_convert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2_convert.c,v 1.49 2015/04/16 19:18:10 markus Exp $ */ +/* $OpenBSD: pfkeyv2_convert.c,v 1.50 2015/04/17 10:04:37 mikeb Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@keromytis.org) * @@ -722,9 +722,6 @@ import_identity(struct ipsec_ref **ipr, struct sadb_ident *sadb_ident) case SADB_IDENTTYPE_USERFQDN: (*ipr)->ref_type = IPSP_IDENTITY_USERFQDN; break; - case SADB_X_IDENTTYPE_CONNECTION: - (*ipr)->ref_type = IPSP_IDENTITY_CONNECTION; - break; default: free(*ipr, M_CREDENTIALS, 0); *ipr = NULL; @@ -754,9 +751,6 @@ export_identity(void **p, struct ipsec_ref **ipr) case IPSP_IDENTITY_USERFQDN: sadb_ident->sadb_ident_type = SADB_IDENTTYPE_USERFQDN; break; - case IPSP_IDENTITY_CONNECTION: - sadb_ident->sadb_ident_type = SADB_X_IDENTTYPE_CONNECTION; - break; } *p += sizeof(struct sadb_ident); bcopy((*ipr) + 1, *p, (*ipr)->ref_len); diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h index 65a8e32ae66..76b215603dc 100644 --- a/sys/netinet/ip_ipsp.h +++ b/sys/netinet/ip_ipsp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.h,v 1.167 2015/04/16 19:44:01 markus Exp $ */ +/* $OpenBSD: ip_ipsp.h,v 1.168 2015/04/17 10:04:37 mikeb Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -235,7 +235,6 @@ struct ipsec_policy { #define IPSP_IDENTITY_PREFIX 1 #define IPSP_IDENTITY_FQDN 2 #define IPSP_IDENTITY_USERFQDN 3 -#define IPSP_IDENTITY_CONNECTION 4 struct tdb { /* tunnel descriptor block */ /* |