diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2003-12-15 10:06:43 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2003-12-15 10:06:43 +0000 |
| commit | ce520cfde52a044a6f14872cc002ab1e9d0ab8b4 (patch) | |
| tree | e8132b9c949e704429c26d0b7921db6316a21797 /sbin/isakmpd/ipsec.c | |
| parent | 657be373735819f3a8b072973382188eed78a5cc (diff) | |
Support for groups modp2048, modp3072, modp4096, modp6144 and modp8192 (IDs 14
to 18).
ok ho@
Diffstat (limited to 'sbin/isakmpd/ipsec.c')
| -rw-r--r-- | sbin/isakmpd/ipsec.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index 9ae26b29dfc..330955f102b 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec.c,v 1.83 2003/11/06 16:12:07 ho Exp $ */ +/* $OpenBSD: ipsec.c,v 1.84 2003/12/15 10:06:42 hshoexer Exp $ */ /* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */ /* @@ -1174,8 +1174,10 @@ ipsec_is_attribute_incompatible (u_int16_t type, u_int8_t *value, case IKE_ATTR_AUTHENTICATION_METHOD: return !ike_auth_get (decode_16 (value)); case IKE_ATTR_GROUP_DESCRIPTION: - return decode_16 (value) < IKE_GROUP_DESC_MODP_768 - || decode_16 (value) > IKE_GROUP_DESC_MODP_1536; + return (decode_16 (value) < IKE_GROUP_DESC_MODP_768 + || decode_16 (value) > IKE_GROUP_DESC_MODP_1536) + && (decode_16 (value) < IKE_GROUP_DESC_MODP_2048 + || decode_16 (value) > IKE_GROUP_DESC_MODP_8192); case IKE_ATTR_GROUP_TYPE: return 1; case IKE_ATTR_GROUP_PRIME: @@ -1217,8 +1219,10 @@ ipsec_is_attribute_incompatible (u_int16_t type, u_int8_t *value, case IPSEC_ATTR_SA_LIFE_DURATION: return len != 2 && len != 4; case IPSEC_ATTR_GROUP_DESCRIPTION: - return decode_16 (value) < IKE_GROUP_DESC_MODP_768 - || decode_16 (value) > IKE_GROUP_DESC_MODP_1536; + return (decode_16 (value) < IKE_GROUP_DESC_MODP_768 + || decode_16 (value) > IKE_GROUP_DESC_MODP_1536) + && (decode_16 (value) < IKE_GROUP_DESC_MODP_2048 + || IKE_GROUP_DESC_MODP_8192 < decode_16 (value)); case IPSEC_ATTR_ENCAPSULATION_MODE: return decode_16 (value) < IPSEC_ENCAP_TUNNEL || decode_16 (value) > IPSEC_ENCAP_TRANSPORT; |