diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-08 17:49:36 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-08 17:49:36 +0000 |
| commit | 49d42ad2a311eabfd774a209cc68a14cbc9a82f2 (patch) | |
| tree | 6d8279d0c0b6546b485ecef89f457a8e7113cdfe /sbin | |
| parent | d2d2c21dafc9e9f8980fecedded213f4bde2bb40 (diff) | |
sysdep/openbsd/sysdep-os.h: Merge with EOM 1.3
pf_key_v2.c: Merge with EOM 1.18
author: niklas
Support building on older PF_KEY systems with non-standard-compliant SADB_-
constants.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/pf_key_v2.c | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/sysdep/openbsd/sysdep-os.h | 36 |
2 files changed, 37 insertions, 5 deletions
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c index 67ca90947d1..b090743ad53 100644 --- a/sbin/isakmpd/pf_key_v2.c +++ b/sbin/isakmpd/pf_key_v2.c @@ -1,5 +1,5 @@ -/* $OpenBSD: pf_key_v2.c,v 1.13 1999/07/07 22:08:10 niklas Exp $ */ -/* $EOM: pf_key_v2.c,v 1.17 1999/07/07 19:17:31 niklas Exp $ */ +/* $OpenBSD: pf_key_v2.c,v 1.14 1999/07/08 17:49:35 niklas Exp $ */ +/* $EOM: pf_key_v2.c,v 1.18 1999/07/08 16:48:40 niklas Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist. All rights reserved. @@ -47,6 +47,8 @@ #include <string.h> #include <unistd.h> +#include "sysdep.h" + #include "conf.h" #include "exchange.h" #include "ipsec.h" diff --git a/sbin/isakmpd/sysdep/openbsd/sysdep-os.h b/sbin/isakmpd/sysdep/openbsd/sysdep-os.h index 1c2bb80b3df..c427ed683ec 100644 --- a/sbin/isakmpd/sysdep/openbsd/sysdep-os.h +++ b/sbin/isakmpd/sysdep/openbsd/sysdep-os.h @@ -1,5 +1,5 @@ -/* $OpenBSD: sysdep-os.h,v 1.3 1999/04/19 20:54:36 niklas Exp $ */ -/* $EOM: sysdep-os.h,v 1.2 1999/04/02 00:58:20 niklas Exp $ */ +/* $OpenBSD: sysdep-os.h,v 1.4 1999/07/08 17:49:35 niklas Exp $ */ +/* $EOM: sysdep-os.h,v 1.3 1999/07/08 16:48:40 niklas Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -37,6 +37,36 @@ #ifndef _SYSDEP_OS_H_ #define _SYSDEP_OS_H_ -/* Nothing here so far. */ +#ifdef SADB_EXT_X_SRC_MASK + +/* Non-conformant PF_KEYv2 extensions, transform them into being conformant. */ + +#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 */ #endif /* _SYSDEP_OS_H_ */ |