diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/local/www/index.php | 3 | ||||
| -rw-r--r-- | src/usr/local/www/system_advanced_misc.php | 1 | ||||
| -rw-r--r-- | src/usr/local/www/vpn_ipsec_phase1.php | 8 | ||||
| -rw-r--r-- | src/usr/local/www/vpn_ipsec_phase2.php | 7 |
4 files changed, 1 insertions, 18 deletions
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."); |
