diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-13 15:46:44 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-07-13 15:46:44 +0000 |
| commit | e6835c832e7dac40d6a1bf278eb0ca847a6e51ed (patch) | |
| tree | 1a79e8294071d55248f002a51fc53fcf05eba307 /sbin/isakmpd | |
| parent | d8aa7318ab0674625bbe7f85c1fa11d55dced829 (diff) | |
ipsec.c: Merge with EOM 1.114
math_group.c: Merge with EOM 1.20
author: niklas
Really make group 5 work
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/ipsec.c | 8 | ||||
| -rw-r--r-- | sbin/isakmpd/math_group.c | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index 96b2fb70c15..a0f5e8397f3 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,5 +1,5 @@ -/* $OpenBSD: ipsec.c,v 1.21 1999/07/07 22:13:08 niklas Exp $ */ -/* $EOM: ipsec.c,v 1.113 1999/06/10 13:34:56 niklas Exp $ */ +/* $OpenBSD: ipsec.c,v 1.22 1999/07/13 15:46:43 niklas Exp $ */ +/* $EOM: ipsec.c,v 1.114 1999/07/13 15:43:21 niklas Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -830,7 +830,7 @@ ipsec_is_attribute_incompatible (u_int16_t type, u_int8_t *value, 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_EC2N_185; + || decode_16 (value) > IKE_GROUP_DESC_MODP_1536; case IKE_ATTR_GROUP_TYPE: return 1; case IKE_ATTR_GROUP_PRIME: @@ -873,7 +873,7 @@ ipsec_is_attribute_incompatible (u_int16_t type, u_int8_t *value, return 0; case IPSEC_ATTR_GROUP_DESCRIPTION: return decode_16 (value) < IKE_GROUP_DESC_MODP_768 - || decode_16 (value) > IKE_GROUP_DESC_EC2N_185; + || decode_16 (value) > IKE_GROUP_DESC_MODP_1536; case IPSEC_ATTR_ENCAPSULATION_MODE: return decode_16 (value) < IPSEC_ENCAP_TUNNEL || decode_16 (value) > IPSEC_ENCAP_TRANSPORT; diff --git a/sbin/isakmpd/math_group.c b/sbin/isakmpd/math_group.c index df297f62ff0..d6592d9699d 100644 --- a/sbin/isakmpd/math_group.c +++ b/sbin/isakmpd/math_group.c @@ -1,5 +1,5 @@ -/* $OpenBSD: math_group.c,v 1.8 1999/06/02 06:30:13 niklas Exp $ */ -/* $EOM: math_group.c,v 1.19 1999/05/28 19:51:45 niklas Exp $ */ +/* $OpenBSD: math_group.c,v 1.9 1999/07/13 15:46:43 niklas Exp $ */ +/* $EOM: math_group.c,v 1.20 1999/07/13 15:43:21 niklas Exp $ */ /* * Copyright (c) 1998 Niels Provos. All rights reserved. @@ -176,6 +176,14 @@ struct group groups[] = { (int (*) (struct group *, void *, u_int8_t *, int))ec2n_setraw, (int (*) (struct group *, void *))ec2n_setrandom, (int (*) (struct group *, void *, void *, void *))ec2n_operation + }, + { + MODP, OAKLEY_GRP_5, 0, &oakley_modp[2], 0, 0, 0, 0, 0, + (int (*) (struct group *))modp_getlen, + (void (*) (struct group *, void *, u_int8_t *))modp_getraw, + (int (*) (struct group *, void *, u_int8_t *, int))modp_setraw, + (int (*) (struct group *, void *))modp_setrandom, + (int (*) (struct group *, void *, void *, void *))modp_operation } }; |