diff options
Diffstat (limited to 'src/etc/inc')
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 7 |
3 files changed, 9 insertions, 2 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']); + } +} ?> |
