Revert "(ipsec) add eap-mschapv2"

This reverts commit 4638d99c.

src/etc/inc/ipsec.inc

@@ -957,10 +957,6 @@ EOD;
                     case 'rsasig':
                         $authentication = "leftauth = pubkey\n\trightauth = pubkey";
                         break;
-                    case 'eap-mschapv2':
-                        $authentication = "leftauth = pubkey\n\trightauth = eap-mschapv2";
-                        $authentication .= "\n\teap_identity=%any";
-                        break;
                     case 'hybrid_rsa_server':
                         $authentication = "leftauth = xauth-generic\n\trightauth = pubkey";
                         $authentication .= "\n\trightauth2 = xauth";

src/www/vpn_ipsec_phase1.php

@@ -156,6 +156,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     $pconfig = $_POST;
     $old_ph1ent = $a_phase1[$p1index];
 
+    // Preperations to kill some settings which aren't left empty by the field.
+    // Unset ca and cert if not required to avoid storing in config
+    if ($pconfig['authentication_method'] == "pre_shared_key" || $pconfig['authentication_method'] == "xauth_psk_server") {
+        unset($pconfig['caref']);
+        unset($pconfig['certref']);
+    }
     // unset dpd on post
     if (!isset($pconfig['dpd_enable'])) {
         unset($pconfig['dpd_delay']);
@@ -178,9 +184,8 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     // For RSA methods, require the CA/Cert.
     switch ($method) {
         case "eap-tls":
-        case 'eap-mschapv2':
             if ($pconfig['iketype'] != 'ikev2') {
-              $input_errors[] = sprintf(gettext("%s can only be used with IKEv2 type VPNs."), strtoupper($method));
+                $input_errors[] = gettext("EAP-TLS can only be used with IKEv2 type VPNs.");
             }
             break;
         case "pre_shared_key":
@@ -443,30 +448,20 @@ include("head.inc");
 
         $("#authentication_method").change(function(){
             $(".auth_opt").hide();
-            $(".auth_opt select,input").prop( "disabled", true );
             switch ($("#authentication_method").val()) {
-                case 'eap-mschapv2':
-                    $(".auth_eap_tls").show();
-                    $(".auth_eap_tls select,input").prop( "disabled", false );
-                    break;
                 case 'eap-tls':
                 case 'hybrid_rsa_server':
                 case 'xauth_rsa_server':
                 case 'rsasig':
                     $(".auth_eap_tls").show();
-                    $(".auth_eap_tls select,input").prop( "disabled", false );
-                    $(".auth_eap_tls_caref").show();
-                    $(".auth_eap_tls_caref select,input").prop( "disabled", false );
                     break;
                 case 'pre_shared_key':
                     if ($("#mobile").val() == undefined) {
                         $(".auth_psk").show();
-                        $(".auth_psk select,input").prop( "disabled", false );
                     }
                     break;
                 default: /* psk modes*/
                     $(".auth_psk").show();
-                    $(".auth_psk select,input").prop( "disabled", false );
                     break;
             }
         });
@@ -671,7 +666,6 @@ include("head.inc");
                         'xauth_rsa_server' => array( 'name' => 'Mutual RSA + Xauth', 'mobile' => true ),
                         'xauth_psk_server' => array( 'name' => 'Mutual PSK + Xauth', 'mobile' => true ),
                         'eap-tls' => array( 'name' => 'EAP-TLS', 'mobile' => true),
-                        'eap-mschapv2' => array( 'name' => 'EAP-MSCHAPV2', 'mobile' => true),
                         'rsasig' => array( 'name' => 'Mutual RSA', 'mobile' => false ),
                         'pre_shared_key' => array( 'name' => 'Mutual PSK', 'mobile' => false ) );
                       foreach ($p1_authentication_methods as $method_type => $method_params) :
@@ -798,7 +792,7 @@ endforeach; ?>
                       </div>
                     </td>
                   </tr>
-                  <tr class="auth_opt auth_eap_tls_caref">
+                  <tr class="auth_opt auth_eap_tls">
                     <td><a id="help_for_caref" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("My Certificate Authority"); ?></td>
                     <td>
                       <select name="caref" class="formselect">