diff options
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/sysdep/openbsd/sysdep-os.h | 56 |
1 files changed, 1 insertions, 55 deletions
diff --git a/sbin/isakmpd/sysdep/openbsd/sysdep-os.h b/sbin/isakmpd/sysdep/openbsd/sysdep-os.h index 05200c619f2..daa36f008fb 100644 --- a/sbin/isakmpd/sysdep/openbsd/sysdep-os.h +++ b/sbin/isakmpd/sysdep/openbsd/sysdep-os.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysdep-os.h,v 1.6 2003/06/03 14:53:11 ho Exp $ */ +/* $OpenBSD: sysdep-os.h,v 1.7 2005/04/08 15:56:35 deraadt Exp $ */ /* $EOM: sysdep-os.h,v 1.3 1999/07/08 16:48:40 niklas Exp $ */ /* @@ -32,58 +32,4 @@ #ifndef _SYSDEP_OS_H_ #define _SYSDEP_OS_H_ -/* - * OpenBSD has at various times had non-conformant PF_KEYv2 definitions. - * Here we transform them into being conformant. - */ - -#ifdef SADB_EXT_X_SRC_MASK -#define SADB_X_EXT_SRC_MASK SADB_EXT_X_SRC_MASK -#define SADB_X_EXT_DST_MASK SADB_EXT_X_DST_MASK -#define SADB_X_EXT_PROTOCOL SADB_EXT_X_PROTOCOL -#define SADB_X_EXT_SA2 SADB_EXT_X_SA2 -#define SADB_X_EXT_SRC_FLOW SADB_EXT_X_SRC_FLOW -#define SADB_X_EXT_DST_FLOW SADB_EXT_X_DST_FLOW -#define SADB_X_EXT_DST2 SADB_EXT_X_DST2 - -#define SADB_X_SATYPE_AH_OLD SADB_SATYPE_X_AH_OLD -#define SADB_X_SATYPE_ESP_OLD SADB_SATYPE_X_ESP_OLD -#define SADB_X_SATYPE_IPIP SADB_SATYPE_X_IPIP - -#define SADB_X_AALG_RIPEMD160HMAC96 SADB_AALG_X_RIPEMD160HMAC96 -#define SADB_X_AALG_MD5 SADB_AALG_X_MD5 -#define SADB_X_AALG_SHA1 SADB_AALG_X_SHA1 - -#define SADB_X_EALG_BLF SADB_EALG_X_BLF -#define SADB_X_EALG_CAST SADB_EALG_X_CAST -#define SADB_X_EALG_SKIPJACK SADB_EALG_X_SKIPJACK - -#define SADB_X_SAFLAGS_HALFIV SADB_SAFLAGS_X_HALFIV -#define SADB_X_SAFLAGS_TUNNEL SADB_SAFLAGS_X_TUNNEL -#define SADB_X_SAFLAGS_CHAINDEL SADB_SAFLAGS_X_CHAINDEL -#define SADB_X_SAFLAGS_LOCALFLOW SADB_SAFLAGS_X_LOCALFLOW -#define SADB_X_SAFLAGS_REPLACEFLOW SADB_SAFLAGS_X_REPLACEFLOW - -#endif /* SADB_EXT_X_SRC_MASK */ - -#if defined (SADB_IDENTTYPE_MBOX) && !defined (SADB_IDENTTYPE_USERFQDN) -#define SADB_IDENTTYPE_USERFQDN SADB_IDENTTYPE_MBOX -#endif - -#ifdef FLOW_X_TYPE_USE -#define SADB_X_FLOW_TYPE_USE FLOW_X_TYPE_USE -#define SADB_X_FLOW_TYPE_ACQUIRE FLOW_X_TYPE_ACQUIRE -#define SADB_X_FLOW_TYPE_REQUIRE FLOW_X_TYPE_REQUIRE -#define SADB_X_FLOW_TYPE_BYPASS FLOW_X_TYPE_BYPASS -#define SADB_X_FLOW_TYPE_DENY FLOW_X_TYPE_DENY -#define SADB_X_FLOW_TYPE_DONTACQ FLOW_X_TYPE_DONTACQ -#endif - -#if OPENBSD_IPSEC_API_VERSION == 1 -#define sadb_x_policy sadb_policy -#define sadb_x_policy_len sadb_policy_len -#define sadb_x_policy_exttype sadb_policy_exttype -#define sadb_x_policy_seq sadb_policy_seq -#endif - #endif /* _SYSDEP_OS_H_ */ |