diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-10-27 08:29:33 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-10-27 08:29:33 +0000 |
| commit | eb3522ecd94c3aab4b928b85e82ca375be020be3 (patch) | |
| tree | f6151d7ade06ca8a91b33a34e87101696d0aa1b7 /sbin/ipsecctl/parse.y | |
| parent | d3bf0afe08cb2e34167651ce64ea95480b5c337e (diff) | |
Support DH groups 19 to 21 and 25 to 30, just like iked(8) does.
ok visa@, markus@
Diffstat (limited to 'sbin/ipsecctl/parse.y')
| -rw-r--r-- | sbin/ipsecctl/parse.y | 52 |
1 files changed, 35 insertions, 17 deletions
diff --git a/sbin/ipsecctl/parse.y b/sbin/ipsecctl/parse.y index 64016a22172..d5ba39ee185 100644 --- a/sbin/ipsecctl/parse.y +++ b/sbin/ipsecctl/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.168 2017/04/19 15:59:38 bluhm Exp $ */ +/* $OpenBSD: parse.y,v 1.169 2017/10/27 08:29:32 mpi Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -136,22 +136,40 @@ const struct ipsec_xf compxfs[] = { const struct ipsec_xf groupxfs[] = { { "unknown", GROUPXF_UNKNOWN, 0, 0 }, { "none", GROUPXF_NONE, 0, 0 }, - { "modp768", GROUPXF_768, 768, 0 }, - { "grp1", GROUPXF_768, 768, 0 }, - { "modp1024", GROUPXF_1024, 1024, 0 }, - { "grp2", GROUPXF_1024, 1024, 0 }, - { "modp1536", GROUPXF_1536, 1536, 0 }, - { "grp5", GROUPXF_1536, 1536, 0 }, - { "modp2048", GROUPXF_2048, 2048, 0 }, - { "grp14", GROUPXF_2048, 2048, 0 }, - { "modp3072", GROUPXF_3072, 3072, 0 }, - { "grp15", GROUPXF_3072, 3072, 0 }, - { "modp4096", GROUPXF_4096, 4096, 0 }, - { "grp16", GROUPXF_4096, 4096, 0 }, - { "modp6144", GROUPXF_6144, 6144, 0 }, - { "grp17", GROUPXF_6144, 6144, 0 }, - { "modp8192", GROUPXF_8192, 8192, 0 }, - { "grp18", GROUPXF_8192, 8192, 0 }, + { "modp768", GROUPXF_1, 768, 0 }, + { "grp1", GROUPXF_1, 768, 0 }, + { "modp1024", GROUPXF_2, 1024, 0 }, + { "grp2", GROUPXF_2, 1024, 0 }, + { "modp1536", GROUPXF_5, 1536, 0 }, + { "grp5", GROUPXF_5, 1536, 0 }, + { "modp2048", GROUPXF_14, 2048, 0 }, + { "grp14", GROUPXF_14, 2048, 0 }, + { "modp3072", GROUPXF_15, 3072, 0 }, + { "grp15", GROUPXF_15, 3072, 0 }, + { "modp4096", GROUPXF_16, 4096, 0 }, + { "grp16", GROUPXF_16, 4096, 0 }, + { "modp6144", GROUPXF_17, 6144, 0 }, + { "grp17", GROUPXF_17, 6144, 0 }, + { "modp8192", GROUPXF_18, 8192, 0 }, + { "grp18", GROUPXF_18, 8192, 0 }, + { "ecp256", GROUPXF_19, 256, 0 }, + { "grp19", GROUPXF_19, 256, 0 }, + { "ecp384", GROUPXF_20, 384, 0 }, + { "grp20", GROUPXF_20, 384, 0 }, + { "ecp521", GROUPXF_21, 521, 0 }, + { "grp21", GROUPXF_21, 521, 0 }, + { "ecp192", GROUPXF_25, 192, 0 }, + { "grp25", GROUPXF_25, 192, 0 }, + { "ecp224", GROUPXF_26, 224, 0 }, + { "grp26", GROUPXF_26, 224, 0 }, + { "bp224", GROUPXF_27, 224, 0 }, + { "grp27", GROUPXF_27, 224, 0 }, + { "bp256", GROUPXF_28, 256, 0 }, + { "grp28", GROUPXF_28, 256, 0 }, + { "bp384", GROUPXF_29, 384, 0 }, + { "grp29", GROUPXF_29, 384, 0 }, + { "bp512", GROUPXF_30, 512, 0 }, + { "grp30", GROUPXF_30, 512, 0 }, { NULL, 0, 0, 0 }, }; |