Attachment #142539 for bug #216063

View | Details | Raw Unified | Return to bug 216063
Collapse All | Expand All




                        <cstring>comboEncryption</cstring>
                    </property>
                </widget>
                <widget class="QLabel" row="3" column="0">
                    <property name="name">
                        <cstring>lblSecret</cstring>
                    </property>

                                            <cstring>EAPurlCA</cstring>
                                        </property>
                                    </widget>
                                    <widget class="QLineEdit" row="3" column="4" rowspan="1" colspan="1">
                                        <property name="name">
                                            <cstring>EAPleditPrivatePassword</cstring>
                                        </property>
                                    </widget>
                                    <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2">
                                        <property name="name">
                                            <cstring>EAPleditPassword</cstring>
                                        </property>

                                            <cstring>EAPcomboMethod</cstring>
                                        </property>
                                    </widget>
                                    <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
                                        <property name="name">
                                            <cstring>EAPleditIdentity</cstring>
                                        </property>

                                            <enum>Normal</enum>
                                        </property>
                                    </widget>
                                    <widget class="QLabel" row="2" column="0">
                                        <property name="name">
                                            <cstring>lblVersion_2_3</cstring>
                                        </property>

                                            <cstring>EAPleditIdentity</cstring>
                                        </property>
                                    </widget>
                                    <widget class="QLabel" row="3" column="3" rowspan="1" colspan="1">
                                        <property name="name">
                                            <cstring>lblVersion_2_4_2_2</cstring>
                                        </property>

                                            <cstring>EAPleditPrivatePassword</cstring>
                                        </property>
                                    </widget>
                                    <widget class="QRadioButton" row="5" column="1" rowspan="2" colspan="1">
                                        <property name="name">
                                            <cstring>EAPrbWPA1</cstring>
                                        </property>

                                            <number>-1</number>
                                        </property>
                                    </widget>
                                    <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="2">
                                        <property name="name">
                                            <cstring>EAPleditAnonIdentity</cstring>
                                        </property>

                                            <enum>Normal</enum>
                                        </property>
                                    </widget>
                                    <widget class="QLabel" row="5" column="0" rowspan="2" colspan="1">
                                        <property name="name">
                                            <cstring>lblVersion_2</cstring>
                                        </property>

                                            <cstring>EAPurlPrivate</cstring>
                                        </property>
                                    </widget>
                                    <widget class="QRadioButton" row="5" column="2" rowspan="2" colspan="1">
                                        <property name="name">
                                            <cstring>EAPrbWPA2</cstring>
                                        </property>

                                            <number>-1</number>
                                        </property>
                                    </widget>
                                    <widget class="QLabel" row="3" column="0">
                                        <property name="name">
                                            <cstring>lblVersion_2_4</cstring>
                                        </property>

                                            <cstring>EAPleditPassword</cstring>
                                        </property>
                                    </widget>
                                    <widget class="QLabel" row="4" column="0">
                                        <property name="name">
                                            <cstring>lblVersion_2_3_3</cstring>
                                        </property>

                                            </sizepolicy>
                                        </property>
                                    </widget>
                                    <widget class="QLabel" row="1" column="0">
                                        <property name="name">
                                            <cstring>lblVersion_2_2</cstring>
                                        </property>
                                        <property name="text">
                                            <string>Phase2 &amp;Type</string>
                                        </property>
                                        <property name="buddy" stdset="0">
                                            <cstring>EAPcomboPhase2Type</cstring>
                                        </property>
                                    </widget>
                                    <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
                                        <item>
                                            <property name="text">
                                                <string>None (Default)</string>
                                            </property>
                                        </item>
                                        <item>
                                            <property name="text">
                                                <string>PAP</string>
                                            </property>
                                        </item>
                                        <item>
                                            <property name="text">
                                                <string>MSCHAP</string>
                                            </property>
                                        </item>
                                        <item>
                                            <property name="text">
                                                <string>MSCHAPV2</string>
                                            </property>
                                        </item>
                                        <item>
                                            <property name="text">
                                                <string>GTC</string>
                                            </property>
                                        </item>
                                        <property name="name">
                                            <cstring>EAPcomboPhase2Type</cstring>
                                        </property>
                                        <property name="sizePolicy">
                                            <sizepolicy>
                                                <hsizetype>3</hsizetype>
                                                <vsizetype>0</vsizetype>
                                                <horstretch>0</horstretch>
                                                <verstretch>0</verstretch>
                                            </sizepolicy>
                                        </property>
                                    </widget>
                                    <widget class="QLabel" row="2" column="3">
                                        <property name="name">
                                            <cstring>lblVersion_2_4_2</cstring>

    <tabstop>leditSecret</tabstop>
    <tabstop>cbShow</tabstop>
    <tabstop>EAPcomboMethod</tabstop>
    <tabstop>EAPcomboPhase2Type</tabstop>
    <tabstop>EAPleditIdentity</tabstop>
    <tabstop>EAPleditPassword</tabstop>
    <tabstop>EAPleditAnonIdentity</tabstop>




	if (!on) {
		enc->setDefaults ();
		cryptoWidget->EAPcomboMethod->setCurrentItem (0);
		cryptoWidget->EAPcomboPhase2Type->setCurrentItem (0);
		cryptoWidget->EAPrbWPA1->setChecked (true);
	}
}

}

void
WirelessDialog::EAPcomboPhase2Type_activated (int id)
{
	Phase2Type phase2type = PHASE2_NONE;
	EncryptionWPAEnterprise* enc = (EncryptionWPAEnterprise*) _encryptionMap [_id_wpa_wpa2enterprise]; 

	switch (id) {
		case 0:
			phase2type = PHASE2_NONE;
			break;
		case 1:
			phase2type = PHASE2_PAP;
			break;
		case 2:
			phase2type = PHASE2_MSCHAP;
			break;
		case 3:
			phase2type = PHASE2_MSCHAPV2;
			break;
		case 4:
			phase2type = PHASE2_GTC;
			break;
		default:
			phase2type = PHASE2_NONE;
	}

	enc->setPhase2 (phase2type);
}

void
WirelessDialog::EAPleditIdentity_textChanged (const QString & identity)
{
	EncryptionWPAEnterprise* enc = (EncryptionWPAEnterprise*) _encryptionMap [_id_wpa_wpa2enterprise]; 	

		 this,                                  SLOT   (EAPrbWPA2_toggled (bool)));
	connect (cryptoWidget->EAPcomboMethod,          SIGNAL (activated (int)),
		 this,                                  SLOT   (EAPcomboMethod_activated (int)));
	connect (cryptoWidget->EAPcomboPhase2Type,      SIGNAL (activated (int)),
		 this,                                  SLOT   (EAPcomboPhase2Type_activated (int)));
	connect (cryptoWidget->EAPleditIdentity,        SIGNAL (textChanged (const QString &)),
		 this,                                  SLOT   (EAPleditIdentity_textChanged (const QString &)));
	connect (cryptoWidget->EAPleditPassword,        SIGNAL (textChanged (const QString &)),

		kdDebug() << k_funcinfo << "WPA Enterprise" << endl;
		cryptoWidget->stackEncAdvanced->raiseWidget(cryptoWidget->advancedWPAEnterpriseWidget);
		EAPcomboMethod_activated(cryptoWidget->EAPcomboMethod->currentItem());
		EAPcomboPhase2Type_activated(cryptoWidget->EAPcomboPhase2Type->currentItem());
	}

	/* WPA Enterprise does not use lblSecret, leditSecret and cbShow */

Lines 64-69 class WirelessDialog : public KDialogBas Link Here

(-)knetworkmanager/src_orig/knetworkmanager-dialogfab.h (+1 lines)
64	void EAPrbWPA1_toggled (bool);	64	void EAPrbWPA1_toggled (bool);
65	void EAPrbWPA2_toggled (bool);	65	void EAPrbWPA2_toggled (bool);
66	void EAPcomboMethod_activated (int);	66	void EAPcomboMethod_activated (int);
		67	void EAPcomboPhase2Type_activated (int);
67	void EAPleditIdentity_textChanged (const QString &);	68	void EAPleditIdentity_textChanged (const QString &);
68	void EAPleditPassword_textChanged (const QString &);	69	void EAPleditPassword_textChanged (const QString &);
69	void EAPleditAnonIdentity_textChanged (const QString &);	70	void EAPleditAnonIdentity_textChanged (const QString &);

Lines 643-652 EncryptionWPAEnterprise::serialize (DBus Link Here

(-)knetworkmanager/src_orig/knetworkmanager-encryption.cpp (-4 / +54 lines)
643	kdDebug () << "method: " << _method << " identity: " << _identity << " password: " << _secret[IdPasswordKey] <<	643	kdDebug () << "method: " << _method << " identity: " << _identity << " password: " << _secret[IdPasswordKey] <<
644	" anon ident: " << _anonIdentity << " cert priv passwd: " << _secret[CertPrivatePasswordKey] <<	644	" anon ident: " << _anonIdentity << " cert priv passwd: " << _secret[CertPrivatePasswordKey] <<
645	" cert priv: " << _certPrivate << " cert client: " << _certClient << " cert CA: " << _certCA <<	645	" cert priv: " << _certPrivate << " cert client: " << _certClient << " cert CA: " << _certCA <<
646	" version: " << _version << endl;	646	" version: " << _version << " phase2: " << _phase2type << endl;
647		647
648	dbus_message_iter_init_append (msg, &iter);	648	dbus_message_iter_init_append (msg, &iter);
649	status = nmu_security_serialize_wpa_eap_with_cipher (&iter, _method, keyType, _identity.utf8(),	649
		650	/* second argument is combined bitfield for eap method and phase2 type */
		651	int bf_method_phase2 = (int)_method \| (int)_phase2type;
		652	status = nmu_security_serialize_wpa_eap_with_cipher (&iter, bf_method_phase2, keyType, _identity.utf8(),
650	_secret[IdPasswordKey].utf8(), _anonIdentity.utf8(),	653	_secret[IdPasswordKey].utf8(), _anonIdentity.utf8(),
651	_secret[CertPrivatePasswordKey].utf8(),	654	_secret[CertPrivatePasswordKey].utf8(),
652	_certPrivate.utf8(), _certClient.utf8(), _certCA.utf8(),	655	_certPrivate.utf8(), _certClient.utf8(), _certCA.utf8(),
Lines 659-664 bool Link Here
659	EncryptionWPAEnterprise::deserialize( DBusMessageIter * iter, int we_cipher )	662	EncryptionWPAEnterprise::deserialize( DBusMessageIter * iter, int we_cipher )
660	{	663	{
661	int method;	664	int method;
		665	EAPMethod eapMethod;
		666	Phase2Type phase2Type;
662	int keyType;	667	int keyType;
663	char* identity = NULL;	668	char* identity = NULL;
664	char* identityPassword = NULL;	669	char* identityPassword = NULL;
Lines 680-689 EncryptionWPAEnterprise::deserialize( DB Link Here
680		685
681	if ( !(version == IW_AUTH_WPA_VERSION_WPA \|\| version == IW_AUTH_WPA_VERSION_WPA2 ) )	686	if ( !(version == IW_AUTH_WPA_VERSION_WPA \|\| version == IW_AUTH_WPA_VERSION_WPA2 ) )
682	return false;	687	return false;
683	if ( !(method == EAP_PEAP \|\| method == EAP_TLS \|\| method == EAP_TTLS ) )	688	eapMethod = ((EAPMethod) NM_EAP_TO_EAP_METHOD (method));
		689	if ( !(eapMethod == EAP_PEAP \|\| eapMethod == EAP_TLS \|\| eapMethod == EAP_TTLS ) )
		690	return false;
		691	phase2Type = ((Phase2Type) NM_EAP_TO_PHASE2_METHOD (method));
		692	if ( !(phase2Type == PHASE2_PAP \|\| phase2Type == PHASE2_MSCHAP \|\| phase2Type == PHASE2_MSCHAPV2 \|\| phase2Type == PHASE2_GTC ) )
684	return false;	693	return false;
685		694
686	setMethod ((EAPMethod) method);	695	setMethod (eapMethod);
		696	setPhase2 (phase2Type);
687	setIdentity (identity);	697	setIdentity (identity);
688	setAnonIdentity (anonIdentity);	698	setAnonIdentity (anonIdentity);
689	setCertPrivate (certPrivate);	699	setCertPrivate (certPrivate);
Lines 716-721 EncryptionWPAEnterprise::setDefaults (vo Link Here
716	setProtocol (WPA_EAP);	726	setProtocol (WPA_EAP);
717	setVersion (WPA1);	727	setVersion (WPA1);
718	setMethod (EAP_PEAP);	728	setMethod (EAP_PEAP);
		729	setPhase2 (PHASE2_NONE);
719	setIdentity ("");	730	setIdentity ("");
720	setAnonIdentity ("");	731	setAnonIdentity ("");
721	setCertPrivate ("");	732	setCertPrivate ("");
Lines 845-850 EncryptionWPAEnterprise::getMethod (void Link Here
845	return _method;	856	return _method;
846	}	857	}
847		858
		859	void
		860	EncryptionWPAEnterprise::setPhase2 (Phase2Type phase2type)
		861	{
		862	kdDebug() << k_funcinfo << " " << phase2type << endl;
		863	_phase2type = phase2type;
		864	}
		865
		866	Phase2Type
		867	EncryptionWPAEnterprise::getPhase2 (void)
		868	{
		869	kdDebug() << k_funcinfo << endl;
		870	return _phase2type;
		871	}
		872
848	EncryptionWPAEnterprise::EncryptionWPAEnterprise ()	873	EncryptionWPAEnterprise::EncryptionWPAEnterprise ()
849	{	874	{
850	kdDebug() << k_funcinfo << endl;	875	kdDebug() << k_funcinfo << endl;
Lines 871-876 void EncryptionWPAEnterprise::persist( K Link Here
871	cfg->writeEntry( "Method", "TTLS" );	896	cfg->writeEntry( "Method", "TTLS" );
872	}	897	}
873		898
		899	if ( _phase2type == PHASE2_NONE) {
		900	cfg->writeEntry( "Phase2", "NONE" );
		901	} else if ( _phase2type == PHASE2_PAP ) {
		902	cfg->writeEntry( "Phase2", "PAP" );
		903	} else if ( _phase2type == PHASE2_MSCHAP ) {
		904	cfg->writeEntry( "Phase2", "MSCHAP" );
		905	} else if ( _phase2type == PHASE2_MSCHAPV2 ) {
		906	cfg->writeEntry( "Phase2", "MSCHAPV2" );
		907	} else if ( _phase2type == PHASE2_GTC ) {
		908	cfg->writeEntry( "Phase2", "GTC" );
		909	}
		910
874	cfg->writeEntry( "Identity", _identity );	911	cfg->writeEntry( "Identity", _identity );
875	cfg->writeEntry( "AnonIdentity", _anonIdentity );	912	cfg->writeEntry( "AnonIdentity", _anonIdentity );
876	cfg->writeEntry( "CertPrivate", _certPrivate );	913	cfg->writeEntry( "CertPrivate", _certPrivate );
Lines 922-927 void EncryptionWPAEnterprise::restore( K Link Here
922	_method = EAP_TTLS;	959	_method = EAP_TTLS;
923	}	960	}
924		961
		962	QString phase2 = cfg->readEntry( "Phase2" );
		963	if ( "PAP" == phase2 ) {
		964	_phase2type = PHASE2_PAP;
		965	} else if ( "MSCHAP" == phase2 ) {
		966	_phase2type = PHASE2_MSCHAP;
		967	} else if ( "MSCHAPV2" == phase2 ) {
		968	_phase2type = PHASE2_MSCHAPV2;
		969	} else if ( "GTC" == phase2 ) {
		970	_phase2type = PHASE2_GTC;
		971	} else {
		972	_phase2type = PHASE2_NONE;
		973	}
		974
925	_identity = cfg->readEntry( "Identity" );	975	_identity = cfg->readEntry( "Identity" );
926	_anonIdentity = cfg->readEntry( "AnonIdentity" );	976	_anonIdentity = cfg->readEntry( "AnonIdentity" );
927	_certPrivate = cfg->readEntry( "CertPrivate" );	977	_certPrivate = cfg->readEntry( "CertPrivate" );

Lines 195-200 enum EAPMethod { Link Here

(-)knetworkmanager/src_orig/knetworkmanager-encryption.h (+11 lines)
195	EAP_TTLS = NM_EAP_METHOD_TTLS	195	EAP_TTLS = NM_EAP_METHOD_TTLS
196	};	196	};
197		197
		198	enum Phase2Type {
		199	PHASE2_NONE = NM_PHASE2_AUTH_NONE,
		200	PHASE2_PAP = NM_PHASE2_AUTH_PAP,
		201	PHASE2_MSCHAP = NM_PHASE2_AUTH_MSCHAP,
		202	PHASE2_MSCHAPV2 = NM_PHASE2_AUTH_MSCHAPV2,
		203	PHASE2_GTC = NM_PHASE2_AUTH_GTC
		204	};
		205
198	class EncryptionWPAEnterprise : public Encryption	206	class EncryptionWPAEnterprise : public Encryption
199	{	207	{
200	public:	208	public:
Lines 223-228 class EncryptionWPAEnterprise : public E Link Here
223	WPAVersion getVersion (void);	231	WPAVersion getVersion (void);
224	void setMethod (EAPMethod);	232	void setMethod (EAPMethod);
225	EAPMethod getMethod (void);	233	EAPMethod getMethod (void);
		234	void setPhase2 (Phase2Type);
		235	Phase2Type getPhase2 (void);
226		236
227	virtual void persist( KConfigBase *, bool withKey = true ) const;	237	virtual void persist( KConfigBase *, bool withKey = true ) const;
228	virtual void restore( KConfigBase *, double version, bool withKey = false);	238	virtual void restore( KConfigBase *, double version, bool withKey = false);
Lines 241-246 class EncryptionWPAEnterprise : public E Link Here
241	WPAProtocol _protocol;	251	WPAProtocol _protocol;
242	WPAVersion _version;	252	WPAVersion _version;
243	EAPMethod _method;	253	EAPMethod _method;
		254	Phase2Type _phase2type;
244	};	255	};
245		256
246	#endif /* KNETWORKMANAGER_ENCRYPTION_H */	257	#endif /* KNETWORKMANAGER_ENCRYPTION_H */

Return to bug 216063

Lines 47-53 Link Here

(-)knetworkmanager/src_orig/cryptowidget.ui (-12 / +62 lines)
47	<cstring>comboEncryption</cstring>	47	<cstring>comboEncryption</cstring>
48	</property>	48	</property>
49	</widget>	49	</widget>
50	<widget class="QLabel" row="1" column="0">	50	<widget class="QLabel" row="3" column="0">
51	<property name="name">	51	<property name="name">
52	<cstring>lblSecret</cstring>	52	<cstring>lblSecret</cstring>
53	</property>	53	</property>
Lines 338-349 Link Here
338	<cstring>EAPurlCA</cstring>	338	<cstring>EAPurlCA</cstring>
339	</property>	339	</property>
340	</widget>	340	</widget>
341	<widget class="QLineEdit" row="3" column="4" rowspan="2" colspan="1">	341	<widget class="QLineEdit" row="3" column="4" rowspan="1" colspan="1">
342	<property name="name">	342	<property name="name">
343	<cstring>EAPleditPrivatePassword</cstring>	343	<cstring>EAPleditPrivatePassword</cstring>
344	</property>	344	</property>
345	</widget>	345	</widget>
346	<widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">	346	<widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2">
347	<property name="name">	347	<property name="name">
348	<cstring>EAPleditPassword</cstring>	348	<cstring>EAPleditPassword</cstring>
349	</property>	349	</property>
Lines 362-368 Link Here
362	<cstring>EAPcomboMethod</cstring>	362	<cstring>EAPcomboMethod</cstring>
363	</property>	363	</property>
364	</widget>	364	</widget>
365	<widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2">	365	<widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2">
366	<property name="name">	366	<property name="name">
367	<cstring>EAPleditIdentity</cstring>	367	<cstring>EAPleditIdentity</cstring>
368	</property>	368	</property>
Lines 370-376 Link Here
370	<enum>Normal</enum>	370	<enum>Normal</enum>
371	</property>	371	</property>
372	</widget>	372	</widget>
373	<widget class="QLabel" row="1" column="0">	373	<widget class="QLabel" row="2" column="0">
374	<property name="name">	374	<property name="name">
375	<cstring>lblVersion_2_3</cstring>	375	<cstring>lblVersion_2_3</cstring>
376	</property>	376	</property>
Lines 381-387 Link Here
381	<cstring>EAPleditIdentity</cstring>	381	<cstring>EAPleditIdentity</cstring>
382	</property>	382	</property>
383	</widget>	383	</widget>
384	<widget class="QLabel" row="3" column="3" rowspan="2" colspan="1">	384	<widget class="QLabel" row="3" column="3" rowspan="1" colspan="1">
385	<property name="name">	385	<property name="name">
386	<cstring>lblVersion_2_4_2_2</cstring>	386	<cstring>lblVersion_2_4_2_2</cstring>
387	</property>	387	</property>
Lines 392-398 Link Here
392	<cstring>EAPleditPrivatePassword</cstring>	392	<cstring>EAPleditPrivatePassword</cstring>
393	</property>	393	</property>
394	</widget>	394	</widget>
395	<widget class="QRadioButton" row="4" column="1" rowspan="2" colspan="1">	395	<widget class="QRadioButton" row="5" column="1" rowspan="2" colspan="1">
396	<property name="name">	396	<property name="name">
397	<cstring>EAPrbWPA1</cstring>	397	<cstring>EAPrbWPA1</cstring>
398	</property>	398	</property>
Lines 417-423 Link Here
417	<number>-1</number>	417	<number>-1</number>
418	</property>	418	</property>
419	</widget>	419	</widget>
420	<widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2">	420	<widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="2">
421	<property name="name">	421	<property name="name">
422	<cstring>EAPleditAnonIdentity</cstring>	422	<cstring>EAPleditAnonIdentity</cstring>
423	</property>	423	</property>
Lines 425-431 Link Here
425	<enum>Normal</enum>	425	<enum>Normal</enum>
426	</property>	426	</property>
427	</widget>	427	</widget>
428	<widget class="QLabel" row="4" column="0" rowspan="2" colspan="1">	428	<widget class="QLabel" row="5" column="0" rowspan="2" colspan="1">
429	<property name="name">	429	<property name="name">
430	<cstring>lblVersion_2</cstring>	430	<cstring>lblVersion_2</cstring>
431	</property>	431	</property>
Lines 468-474 Link Here
468	<cstring>EAPurlPrivate</cstring>	468	<cstring>EAPurlPrivate</cstring>
469	</property>	469	</property>
470	</widget>	470	</widget>
471	<widget class="QRadioButton" row="4" column="2" rowspan="2" colspan="1">	471	<widget class="QRadioButton" row="5" column="2" rowspan="2" colspan="1">
472	<property name="name">	472	<property name="name">
473	<cstring>EAPrbWPA2</cstring>	473	<cstring>EAPrbWPA2</cstring>
474	</property>	474	</property>
Lines 490-496 Link Here
490	<number>-1</number>	490	<number>-1</number>
491	</property>	491	</property>
492	</widget>	492	</widget>
493	<widget class="QLabel" row="2" column="0">	493	<widget class="QLabel" row="3" column="0">
494	<property name="name">	494	<property name="name">
495	<cstring>lblVersion_2_4</cstring>	495	<cstring>lblVersion_2_4</cstring>
496	</property>	496	</property>
Lines 501-507 Link Here
501	<cstring>EAPleditPassword</cstring>	501	<cstring>EAPleditPassword</cstring>
502	</property>	502	</property>
503	</widget>	503	</widget>
504	<widget class="QLabel" row="3" column="0">	504	<widget class="QLabel" row="4" column="0">
505	<property name="name">	505	<property name="name">
506	<cstring>lblVersion_2_3_3</cstring>	506	<cstring>lblVersion_2_3_3</cstring>
507	</property>	507	</property>
Lines 540-545 Link Here
540	</sizepolicy>	540	</sizepolicy>
541	</property>	541	</property>
542	</widget>	542	</widget>
		543	<widget class="QLabel" row="1" column="0">
		544	<property name="name">
		545	<cstring>lblVersion_2_2</cstring>
		546	</property>
		547	<property name="text">
		548	<string>Phase2 &Type</string>
		549	</property>
		550	<property name="buddy" stdset="0">
		551	<cstring>EAPcomboPhase2Type</cstring>
		552	</property>
		553	</widget>
		554	<widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
		555	<item>
		556	<property name="text">
		557	<string>None (Default)</string>
		558	</property>
		559	</item>
		560	<item>
		561	<property name="text">
		562	<string>PAP</string>
		563	</property>
		564	</item>
		565	<item>
		566	<property name="text">
		567	<string>MSCHAP</string>
		568	</property>
		569	</item>
		570	<item>
		571	<property name="text">
		572	<string>MSCHAPV2</string>
		573	</property>
		574	</item>
		575	<item>
		576	<property name="text">
		577	<string>GTC</string>
		578	</property>
		579	</item>
		580	<property name="name">
		581	<cstring>EAPcomboPhase2Type</cstring>
		582	</property>
		583	<property name="sizePolicy">
		584	<sizepolicy>
		585	<hsizetype>3</hsizetype>
		586	<vsizetype>0</vsizetype>
		587	<horstretch>0</horstretch>
		588	<verstretch>0</verstretch>
		589	</sizepolicy>
		590	</property>
		591	</widget>
543	<widget class="QLabel" row="2" column="3">	592	<widget class="QLabel" row="2" column="3">
544	<property name="name">	593	<property name="name">
545	<cstring>lblVersion_2_4_2</cstring>	594	<cstring>lblVersion_2_4_2</cstring>
Lines 570-575 Link Here
570	<tabstop>leditSecret</tabstop>	619	<tabstop>leditSecret</tabstop>
571	<tabstop>cbShow</tabstop>	620	<tabstop>cbShow</tabstop>
572	<tabstop>EAPcomboMethod</tabstop>	621	<tabstop>EAPcomboMethod</tabstop>
		622	<tabstop>EAPcomboPhase2Type</tabstop>
573	<tabstop>EAPleditIdentity</tabstop>	623	<tabstop>EAPleditIdentity</tabstop>
574	<tabstop>EAPleditPassword</tabstop>	624	<tabstop>EAPleditPassword</tabstop>
575	<tabstop>EAPleditAnonIdentity</tabstop>	625	<tabstop>EAPleditAnonIdentity</tabstop>

Lines 490-495 WirelessDialog::groupWPAEAPAdvanced_togg Link Here

(-)knetworkmanager/src_orig/knetworkmanager-dialogfab.cpp (+33 lines)
490	if (!on) {	490	if (!on) {
491	enc->setDefaults ();	491	enc->setDefaults ();
492	cryptoWidget->EAPcomboMethod->setCurrentItem (0);	492	cryptoWidget->EAPcomboMethod->setCurrentItem (0);
		493	cryptoWidget->EAPcomboPhase2Type->setCurrentItem (0);
493	cryptoWidget->EAPrbWPA1->setChecked (true);	494	cryptoWidget->EAPrbWPA1->setChecked (true);
494	}	495	}
495	}	496	}
Lines 543-548 WirelessDialog::EAPcomboMethod_activated Link Here
543	}	544	}
544		545
545	void	546	void
		547	WirelessDialog::EAPcomboPhase2Type_activated (int id)
		548	{
		549	Phase2Type phase2type = PHASE2_NONE;
		550	EncryptionWPAEnterprise* enc = (EncryptionWPAEnterprise*) _encryptionMap [_id_wpa_wpa2enterprise];
		551
		552	switch (id) {
		553	case 0:
		554	phase2type = PHASE2_NONE;
		555	break;
		556	case 1:
		557	phase2type = PHASE2_PAP;
		558	break;
		559	case 2:
		560	phase2type = PHASE2_MSCHAP;
		561	break;
		562	case 3:
		563	phase2type = PHASE2_MSCHAPV2;
		564	break;
		565	case 4:
		566	phase2type = PHASE2_GTC;
		567	break;
		568	default:
		569	phase2type = PHASE2_NONE;
		570	}
		571
		572	enc->setPhase2 (phase2type);
		573	}
		574
		575	void
546	WirelessDialog::EAPleditIdentity_textChanged (const QString & identity)	576	WirelessDialog::EAPleditIdentity_textChanged (const QString & identity)
547	{	577	{
548	EncryptionWPAEnterprise* enc = (EncryptionWPAEnterprise*) _encryptionMap [_id_wpa_wpa2enterprise];	578	EncryptionWPAEnterprise* enc = (EncryptionWPAEnterprise*) _encryptionMap [_id_wpa_wpa2enterprise];
Lines 645-650 WirelessDialog::connectCryptoWidget() Link Here
645	this, SLOT (EAPrbWPA2_toggled (bool)));	675	this, SLOT (EAPrbWPA2_toggled (bool)));
646	connect (cryptoWidget->EAPcomboMethod, SIGNAL (activated (int)),	676	connect (cryptoWidget->EAPcomboMethod, SIGNAL (activated (int)),
647	this, SLOT (EAPcomboMethod_activated (int)));	677	this, SLOT (EAPcomboMethod_activated (int)));
		678	connect (cryptoWidget->EAPcomboPhase2Type, SIGNAL (activated (int)),
		679	this, SLOT (EAPcomboPhase2Type_activated (int)));
648	connect (cryptoWidget->EAPleditIdentity, SIGNAL (textChanged (const QString &)),	680	connect (cryptoWidget->EAPleditIdentity, SIGNAL (textChanged (const QString &)),
649	this, SLOT (EAPleditIdentity_textChanged (const QString &)));	681	this, SLOT (EAPleditIdentity_textChanged (const QString &)));
650	connect (cryptoWidget->EAPleditPassword, SIGNAL (textChanged (const QString &)),	682	connect (cryptoWidget->EAPleditPassword, SIGNAL (textChanged (const QString &)),
Lines 687-692 WirelessDialog::comboEncryption_activate Link Here
687	kdDebug() << k_funcinfo << "WPA Enterprise" << endl;	719	kdDebug() << k_funcinfo << "WPA Enterprise" << endl;
688	cryptoWidget->stackEncAdvanced->raiseWidget(cryptoWidget->advancedWPAEnterpriseWidget);	720	cryptoWidget->stackEncAdvanced->raiseWidget(cryptoWidget->advancedWPAEnterpriseWidget);
689	EAPcomboMethod_activated(cryptoWidget->EAPcomboMethod->currentItem());	721	EAPcomboMethod_activated(cryptoWidget->EAPcomboMethod->currentItem());
		722	EAPcomboPhase2Type_activated(cryptoWidget->EAPcomboPhase2Type->currentItem());
690	}	723	}
691		724
692	/* WPA Enterprise does not use lblSecret, leditSecret and cbShow */	725	/* WPA Enterprise does not use lblSecret, leditSecret and cbShow */