Web lists-archives.org

Re: Announce: Network Manager Applet and Dataengine in kdereview




On Sunday 11 May 2008, Christopher Blauvelt wrote:

> This patch is not totally complete.  It allows you to set Wep-256 in the
> widget but it will never be set in the networkmanager.  See loadEncryption
> in networkmanager.cpp.

thanks Chris, patch updated :)

> Chris
> 
Francesco
-- 
Francesco Cecconi 
francesco.cecconi@xxxxxxxxx
GPG Key ID: 11F6E468 | '|BrAnD|'
Nmapsi4 Core Developer | nmapsi4.netsons.org
Index: applets/networkmanager/networkmanager.cpp
===================================================================
--- applets/networkmanager/networkmanager.cpp	(revision 806568)
+++ applets/networkmanager/networkmanager.cpp	(working copy)
@@ -344,11 +344,17 @@
             authwep->setType((Solid::Control::AuthenticationWep::WepType)authGroup.readEntry("WEPEncryptionKeyType", 0));
             authwep->setMethod((Solid::Control::AuthenticationWep::WepMethod)authGroup.readEntry("WEPAuthentication", 0));
             int wepType = authGroup.readEntry("WEPType", 0);
-            if (wepType == 0) {
-                authwep->setKeyLength(64);
-            } else {
-                authwep->setKeyLength(128);
-            }
+	    switch(wepType) {
+	        case 0:
+		    authwep->setKeyLength(64);
+		    break;
+	        case 1:
+		    authwep->setKeyLength(128);
+		    break;
+	        case 2:
+		    authwep->setKeyLength(256);
+		    break;		
+	    }
             switch(authwep->type()) {
                 case EncryptionSettingsWidget::Ascii:
                 case EncryptionSettingsWidget::Hex:
Index: applets/networkmanager/widgets/encryptionsettingswidget.cpp
===================================================================
--- applets/networkmanager/widgets/encryptionsettingswidget.cpp	(revision 806568)
+++ applets/networkmanager/widgets/encryptionsettingswidget.cpp	(working copy)
@@ -36,7 +36,7 @@
       m_hexLetters("abcdef")
 {
     m_authTypes << i18n("Open") << i18n("Shared");
-    m_encTypes << i18n("WEP-64") << i18n("WEP-128"); // << i18n("CKIP-128") << i18n("CKIP-128");TODO
+    m_encTypes << i18n("WEP-64") << i18n("WEP-128") << i18n("WEP-256"); // << i18n("CKIP-128") << i18n("CKIP-128");TODO
     m_keyTypes << i18n("ASCII") << i18n("Hex") << i18n("Passphrase");
     
     m_mainLayout = new QVBoxLayout(this);
@@ -348,6 +348,9 @@
         case Wep128:
             m_keyLength = 10;
             break;
+        case Wep256:
+            m_keyLength = 26;
+            break;
         default:
             kDebug() << "Wep type not recognized.";
             emit validationChanged(false);
Index: applets/networkmanager/widgets/encryptionsettingswidget.h
===================================================================
--- applets/networkmanager/widgets/encryptionsettingswidget.h	(revision 806568)
+++ applets/networkmanager/widgets/encryptionsettingswidget.h	(working copy)
@@ -63,7 +63,7 @@
     Q_OBJECT
 
     public:
-        enum WepType {Wep64, Wep128}; //, Ckip64, Ckip128};TODO
+        enum WepType {Wep64, Wep128, Wep256}; //, Ckip64, Ckip128};TODO
         WepSettingsWidget(QWidget *parent=0);
         ~WepSettingsWidget();
 

Attachment: signature.asc
Description: This is a digitally signed message part.

 
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<