mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to glxsb as it is not relevant to current supported platforms. Fixes #6755

Browse Source
This commit is contained in:
jim-p 2016-09-01 11:00:55 -04:00
parent e4191be8e3
commit 2ce5cd33ef
8 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/globals.inc
View File

@ -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",

2
src/etc/inc/pfsense-utils.inc
View File

@ -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;

7
src/etc/inc/upgrade_config.inc
View File

@ -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']);
}
}
?>

3
src/usr/local/www/index.php
View File

@ -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;
}

1
src/usr/local/www/system_advanced_misc.php
View File

@ -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(

8
src/usr/local/www/vpn_ipsec_phase1.php
View File

@ -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'])) {

7
src/usr/local/www/vpn_ipsec_phase2.php
View File

@ -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.");

2
tools/builder_defaults.sh
View File

@ -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}/"}