diff options
author | jim-p <jimp@pfsense.org> | 2011-03-29 12:00:02 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-03-29 12:00:02 -0400 |
commit | a5187d43751edccce1aceb7efec96aae91d616dc (patch) | |
tree | cc4ed7cf930e1acd5368d67aa1f7cf352d064a63 /etc/inc/upgrade_config.inc | |
parent | 92273f2459a8883114eb44e4fae595ed95f18199 (diff) | |
download | pfsense-a5187d43751edccce1aceb7efec96aae91d616dc.zip pfsense-a5187d43751edccce1aceb7efec96aae91d616dc.tar.gz |
Check for "aes 256" as IPsec encryption type, not just rijndael.
Diffstat (limited to 'etc/inc/upgrade_config.inc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 207b112..de5c600 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -982,6 +982,7 @@ function upgrade_046_to_047() { $ph1alg = array( 'name' => 'aes', 'keylen' => '128' ); break; case "rijndael 256": + case "aes 256": $ph1alg = array( 'name' => 'aes', 'keylen' => '256' ); break; } @@ -1066,6 +1067,7 @@ function upgrade_046_to_047() { break; case "rijndael": case "rijndael 256": + case "aes 256": $ph2alg = array( 'name' => 'aes', 'keylen' => 'auto' ); $aes_found = true; $aes_count++; @@ -1158,6 +1160,7 @@ function upgrade_046_to_047() { $ph1alg = array( 'name' => 'aes', 'keylen' => '128' ); break; case "rijndael 256": + case "aes 256": $ph1alg = array( 'name' => 'aes', 'keylen' => '256' ); break; } @@ -1206,6 +1209,7 @@ function upgrade_046_to_047() { break; case "rijndael": case "rijndael 256": + case "aes 256": $ph2alg = array( 'name' => 'aes', 'keylen' => 'auto' ); $aes_found = true; $aes_count++; |