diff options
author | Ermal LUÇI <eri@pfsense.org> | 2015-04-20 20:54:28 +0200 |
---|---|---|
committer | Ermal LUÇI <eri@pfsense.org> | 2015-04-20 20:54:28 +0200 |
commit | a75d1a5f0164d5dbf8cc98fc00d0bddd646ef756 (patch) | |
tree | db87d24efc0ddfc60f299c9934a3c26897950e77 /etc | |
parent | 868a62be4c27860aef9f3fd939beee5a6f26090a (diff) | |
download | pfsense-a75d1a5f0164d5dbf8cc98fc00d0bddd646ef756.zip pfsense-a75d1a5f0164d5dbf8cc98fc00d0bddd646ef756.tar.gz |
Allow to configure new modes for phase1 according to RFC 5903 by manually merging pull request #1501 partially. While here preserve style.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/ipsec.inc | 3 | ||||
-rw-r--r-- | etc/inc/vpn.inc | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc index c81edc5..6e3e346 100644 --- a/etc/inc/ipsec.inc +++ b/etc/inc/ipsec.inc @@ -105,6 +105,9 @@ $p1_dhgroups = array( 16 => '16 (4096 bit)', 17 => '17 (6144 bit)', 18 => '18 (8192 bit)', + 19 => '19 (nist ecp256)', + 20 => '20 (nist ecp384)', + 21 => '21 (nist ecp521)', 22 => '22 (1024(sub 160) bit)', 23 => '23 (2048(sub 224) bit)', 24 => '24 (2048(sub 256) bit)' diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 4dbf94b..9df0cd6 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -89,6 +89,15 @@ function vpn_ipsec_convert_to_modp($index) case '18': $convertion = "modp8192"; break; + case '19': + $convertion = "ecp256"; + break; + case '20': + $convertion = "ecp384"; + break; + case '21': + $convertion = "ecp512"; + break; } return $convertion; |