summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/etc/inc/globals.inc2
-rw-r--r--src/etc/inc/pfsense-utils.inc2
-rw-r--r--src/etc/inc/upgrade_config.inc7
-rw-r--r--src/usr/local/www/index.php3
-rw-r--r--src/usr/local/www/system_advanced_misc.php1
-rw-r--r--src/usr/local/www/vpn_ipsec_phase1.php8
-rw-r--r--src/usr/local/www/vpn_ipsec_phase2.php7
-rw-r--r--tools/builder_defaults.sh2
8 files changed, 11 insertions, 21 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc
index 2dd1714..cadb013 100644
--- a/src/etc/inc/globals.inc
+++ b/src/etc/inc/globals.inc
@@ -67,7 +67,7 @@ $g = array(
"disablecrashreporter" => false,
"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
"debug" => false,
- "latest_config" => "15.5",
+ "latest_config" => "15.6",
"nopkg_platforms" => array("cdrom"),
"minimum_ram_warning" => "101",
"minimum_ram_warning_text" => "128 MB",
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc
index 9087ff7..ebf80a8 100644
--- a/src/etc/inc/pfsense-utils.inc
+++ b/src/etc/inc/pfsense-utils.inc
@@ -1777,7 +1777,7 @@ function compare_hostname_to_dnscache($hostname) {
*/
function load_crypto() {
global $config, $g;
- $crypto_modules = array('glxsb', 'aesni');
+ $crypto_modules = array('aesni');
if (!in_array($config['system']['crypto_hardware'], $crypto_modules)) {
return false;
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index ffb21af..aea055c 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4970,4 +4970,11 @@ function upgrade_154_to_155() {
}
}
}
+
+/* Unset references to glxsb in the config. See #6755 */
+function upgrade_155_to_156() {
+ if ($config['system']['crypto_hardware'] == "glxsb") {
+ unset($config['system']['crypto_hardware']);
+ }
+}
?>
diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php
index 8ff71eb..a295146 100644
--- a/src/usr/local/www/index.php
+++ b/src/usr/local/www/index.php
@@ -211,8 +211,7 @@ if ($fd) {
or preg_match("/.*(VIA Padlock)/", $dmesgl, $matches)
or preg_match("/^safe.: (\w.*)/", $dmesgl, $matches)
or preg_match("/^ubsec.: (.*?),/", $dmesgl, $matches)
- or preg_match("/^padlock.: <(.*?)>,/", $dmesgl, $matches)
- or preg_match("/^glxsb.: (.*?),/", $dmesgl, $matches)) {
+ or preg_match("/^padlock.: <(.*?)>,/", $dmesgl, $matches)) {
$hwcrypto = $matches[1];
break;
}
diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php
index cb58a02..baff8e6 100644
--- a/src/usr/local/www/system_advanced_misc.php
+++ b/src/usr/local/www/system_advanced_misc.php
@@ -73,7 +73,6 @@ if (!empty($config['system']['powerd_normal_mode'])) {
}
$crypto_modules = array(
- 'glxsb' => gettext("AMD Geode LX Security Block"),
'aesni' => gettext("AES-NI CPU-based Acceleration"));
$thermal_hardware_modules = array(
diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php
index a9fb081..faed1d7 100644
--- a/src/usr/local/www/vpn_ipsec_phase1.php
+++ b/src/usr/local/www/vpn_ipsec_phase1.php
@@ -395,14 +395,6 @@ if ($_POST) {
$input_errors[] = gettext("Encryption Algorithm AES-GCM can only be used with IKEv2");
}
- if (!empty($_POST['ealgo']) && isset($config['system']['crypto_hardware'])) {
- if ($config['system']['crypto_hardware'] == "glxsb") {
- if ($_POST['ealgo'] == "aes" && $_POST['ealgo_keylen'] != "128") {
- $input_errors[] = gettext("Only 128 bit AES can be used where the glxsb crypto accelerator is enabled.");
- }
- }
- }
-
/* auth backend for mobile eap-radius VPNs should be a RADIUS server */
if (($pconfig['authentication_method'] == 'eap-radius') && $pconfig['mobile']) {
if (!empty($config['ipsec']['client']['user_source'])) {
diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php
index 940f782..c332cf8 100644
--- a/src/usr/local/www/vpn_ipsec_phase2.php
+++ b/src/usr/local/www/vpn_ipsec_phase2.php
@@ -333,13 +333,6 @@ if ($_POST) {
$input_errors[] = gettext("At least one encryption algorithm must be selected.");
} else {
foreach ($ealgos as $ealgo) {
- if (isset($config['system']['crypto_hardware'])) {
- if ($config['system']['crypto_hardware'] == "glxsb") {
- if ($ealgo['name'] == "aes" && $ealgo['keylen'] != "128") {
- $input_errors[] = gettext("Only 128 bit AES can be used where the glxsb crypto accelerator is enabled.");
- }
- }
- }
if (empty($pconfig['halgos'])) {
if (!strpos($ealgo['name'], "gcm")) {
$input_errors[] = gettext("At least one hashing algorithm needs to be selected.");
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 4543edd..4ac4b55 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -143,7 +143,7 @@ export KERNEL_BUILD_PATH=${KERNEL_BUILD_PATH:-"${SCRATCHDIR}/kernels"}
# Do not touch builder /usr/obj
export MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX:-"${SCRATCHDIR}/obj"}
-export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs glxsb if_stf coretemp amdtemp aesni sfxge hwpmc vmm nmdm ix ixv"}
+export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs if_stf coretemp amdtemp aesni sfxge hwpmc vmm nmdm ix ixv"}
# Area that the final image will appear in
export IMAGES_FINAL_DIR=${IMAGES_FINAL_DIR:-"${SCRATCHDIR}/${PRODUCT_NAME}/"}
OpenPOWER on IntegriCloud