diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 16:37:16 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-08 16:37:16 +0000 |
| commit | f49279cdf071a5ab367e1553a8119d25cc269cee (patch) | |
| tree | 09b035c863c017f909d34e4e70297f28b05c5534 /sbin/isakmpd/ipsec.c | |
| parent | 415403bc073db310bf8ad65abed26f6253c78c3c (diff) | |
nat-traversal always
Diffstat (limited to 'sbin/isakmpd/ipsec.c')
| -rw-r--r-- | sbin/isakmpd/ipsec.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index 2cad2c40edb..ef54cfe8161 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec.c,v 1.113 2005/04/08 16:09:25 deraadt Exp $ */ +/* $OpenBSD: ipsec.c,v 1.114 2005/04/08 16:37:14 deraadt Exp $ */ /* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */ /* @@ -65,9 +65,7 @@ #include "log.h" #include "math_group.h" #include "message.h" -#if defined (USE_NAT_TRAVERSAL) #include "nat_traversal.h" -#endif #include "prf.h" #include "sa.h" #include "timer.h" @@ -321,10 +319,8 @@ ipsec_finalize_exchange(struct message *msg) if (isakmp_sa->seconds) sa_setup_expirations(isakmp_sa); -#if defined (USE_NAT_TRAVERSAL) if (isakmp_sa->flags & SA_FLAG_NAT_T_KEEPALIVE) nat_t_setup_keepalive(isakmp_sa); -#endif break; } break; @@ -1178,15 +1174,10 @@ ipsec_is_attribute_incompatible(u_int16_t type, u_int8_t *value, u_int16_t len, (dv < IKE_GROUP_DESC_MODP_2048 || IKE_GROUP_DESC_MODP_8192 < dv); case IPSEC_ATTR_ENCAPSULATION_MODE: -#if defined (USE_NAT_TRAVERSAL) return dv != IPSEC_ENCAP_TUNNEL && dv != IPSEC_ENCAP_TRANSPORT && dv != IPSEC_ENCAP_UDP_ENCAP_TUNNEL && dv != IPSEC_ENCAP_UDP_ENCAP_TRANSPORT; -#else - return dv < IPSEC_ENCAP_TUNNEL || - dv > IPSEC_ENCAP_TRANSPORT; -#endif /* USE_NAT_TRAVERSAL */ case IPSEC_ATTR_AUTHENTICATION_ALGORITHM: return dv < IPSEC_AUTH_HMAC_MD5 || dv > IPSEC_AUTH_HMAC_RIPEMD; |