summaryrefslogtreecommitdiff
path: root/sbin/iked/parse.y
diff options
context:
space:
mode:
Diffstat (limited to 'sbin/iked/parse.y')
-rw-r--r--sbin/iked/parse.y9
1 files changed, 1 insertions, 8 deletions
diff --git a/sbin/iked/parse.y b/sbin/iked/parse.y
index bbf63e0353d..99880c3f58b 100644
--- a/sbin/iked/parse.y
+++ b/sbin/iked/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.58 2016/09/03 09:20:07 vgross Exp $ */
+/* $OpenBSD: parse.y,v 1.59 2017/01/04 12:31:01 mikeb Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -125,7 +125,6 @@ struct iked_transform ikev2_default_ike_transforms[] = {
{ IKEV2_XFORMTYPE_PRF, IKEV2_XFORMPRF_HMAC_SHA1 },
{ IKEV2_XFORMTYPE_INTEGR, IKEV2_XFORMAUTH_HMAC_SHA2_256_128 },
{ IKEV2_XFORMTYPE_INTEGR, IKEV2_XFORMAUTH_HMAC_SHA1_96 },
- { IKEV2_XFORMTYPE_DH, IKEV2_XFORMDH_MODP_2048_256 },
{ IKEV2_XFORMTYPE_DH, IKEV2_XFORMDH_MODP_2048 },
{ IKEV2_XFORMTYPE_DH, IKEV2_XFORMDH_MODP_1536 },
{ IKEV2_XFORMTYPE_DH, IKEV2_XFORMDH_MODP_1024 },
@@ -226,12 +225,6 @@ const struct ipsec_xf groupxfs[] = {
{ "grp20", IKEV2_XFORMDH_ECP_384 },
{ "ecp521", IKEV2_XFORMDH_ECP_521 },
{ "grp21", IKEV2_XFORMDH_ECP_521 },
- { "modp1024-160", IKEV2_XFORMDH_MODP_1024_160 },
- { "grp22", IKEV2_XFORMDH_MODP_1024_160 },
- { "modp2048-224", IKEV2_XFORMDH_MODP_2048_224 },
- { "grp23", IKEV2_XFORMDH_MODP_2048_224 },
- { "modp2048-256", IKEV2_XFORMDH_MODP_2048_256 },
- { "grp24", IKEV2_XFORMDH_MODP_2048_256 },
{ "ecp192", IKEV2_XFORMDH_ECP_192 },
{ "grp25", IKEV2_XFORMDH_ECP_192 },
{ "ecp224", IKEV2_XFORMDH_ECP_224 },