Fixed reversed WEP keys hexmode

We need to fix wifiQuickConnect!! Can't assume it is plaintext or hex, need to determine it automatically, or ask the user
trueos · Mar 15, 2014 · 31467bf · 31467bf
1 parent 53ff927
commit 31467bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src-qt4/libpcbsd/utils/netif.cpp b/src-qt4/libpcbsd/utils/netif.cpp
@@ -536,7 +536,9 @@ void NetworkInterface::wifiQuickConnect(QString SSID, QString netKey, QString De
        } else if ( SecType.contains("WEP") ) {
 	  //Set WEP Defaults
 	  int WEPIndex = 0;
-          bool WEPHex = true; //Use Hex WEP key
+	  // Default to plain-text WEP keys..
+	  // This needs to be fixed to figure it out automatically
+          bool WEPHex = false;
 
           streamout << " key_mgmt=NONE\n";
           streamout << " wep_tx_keyidx=" + tmp.setNum(WEPIndex) + "\n";

diff --git a/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp b/src-qt4/pc-netmanager/src/wificonfig/wificonfigwidgetbase.cpp
@@ -164,9 +164,9 @@ void wificonfigwidgetbase::updateWPASupp()
            streamout << " wep_tx_keyidx=" + tmp.setNum(WEPIndex[curItem]) + "\n";
            // Check if we are using a plaintext WEP or not
            if ( WEPHex[curItem] )
-             streamout << " wep_key" + tmp.setNum(WEPIndex[curItem]) + "=\"" + WEPKey[curItem] + "\"\n";
-           else
              streamout << " wep_key" + tmp.setNum(WEPIndex[curItem]) + "=" + WEPKey[curItem] + "\n";
+           else
+             streamout << " wep_key" + tmp.setNum(WEPIndex[curItem]) + "=\"" + WEPKey[curItem] + "\"\n";
 
          } else if (SSIDEncType[curItem] == WPA_ENCRYPTION ) {