From a5187d43751edccce1aceb7efec96aae91d616dc Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 29 Mar 2011 12:00:02 -0400
Subject: [PATCH] Check for "aes 256" as IPsec encryption type, not just
 rijndael.

---
 etc/inc/upgrade_config.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 207b1126df..de5c6000f3 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++;