diff options
| author | tobhe <tobhe@cvs.openbsd.org> | 2020-04-28 15:18:53 +0000 |
|---|---|---|
| committer | tobhe <tobhe@cvs.openbsd.org> | 2020-04-28 15:18:53 +0000 |
| commit | a33f6c50aa625c37b886f828145d4593352b9e84 (patch) | |
| tree | fe28ff33a76e4065efcf3cf585f2050e9f6242cb /sbin/iked/dh.c | |
| parent | b147af3335f67e00f5decccc04e8e072c7f8c557 (diff) | |
Remove support for insecure EC2N groups. Clarify which Diffie-Hellman
groups are not recommended to use and are only supported for backwards
compatibility.
Feedback from sthen@
ok kn@
Diffstat (limited to 'sbin/iked/dh.c')
| -rw-r--r-- | sbin/iked/dh.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sbin/iked/dh.c b/sbin/iked/dh.c index 40e67ae2289..09f86d1f68b 100644 --- a/sbin/iked/dh.c +++ b/sbin/iked/dh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dh.c,v 1.22 2019/04/02 09:42:55 sthen Exp $ */ +/* $OpenBSD: dh.c,v 1.23 2020/04/28 15:18:52 tobhe Exp $ */ /* * Copyright (c) 2010-2014 Reyk Floeter <reyk@openbsd.org> @@ -35,7 +35,7 @@ int modp_getlen(struct group *); int modp_create_exchange(struct group *, uint8_t *); int modp_create_shared(struct group *, uint8_t *, uint8_t *); -/* EC2N/ECP */ +/* ECP */ int ec_init(struct group *); int ec_getlen(struct group *); int ec_secretlen(struct group *); @@ -83,8 +83,6 @@ const struct group_id ike_groups[] = { "FFFFFFFFFFFFFFFF", "02" }, - { GROUP_EC2N, 3, 155, NULL, NULL, NID_ipsec3 }, - { GROUP_EC2N, 4, 185, NULL, NULL, NID_ipsec4 }, { GROUP_MODP, 5, 1536, "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" @@ -290,7 +288,6 @@ group_get(uint32_t id) group->exchange = modp_create_exchange; group->shared = modp_create_shared; break; - case GROUP_EC2N: case GROUP_ECP: group->init = ec_init; group->getlen = ec_getlen; |