FCL/sf/mw/accesssec: comparison eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/eap_am_type_mschapv2

equal deleted inserted replaced

-:e03a3db4489e
+:9abfd4f00d37
 * Description:  EAP and WLAN authentication protocols.
 *
 */
 /*
-* %version: 33 %
+* %version: 30.1.14 %
 */
 // This is enumeration of EAPOL source code.
 #if defined(USE_EAP_MINIMUM_RELEASE_TRACES)
 	#undef EAP_FILE_NUMBER_ENUM
 #include "EapMsChapV2DbDefaults.h"
 #include "EapMsChapV2DbUtils.h"
 #include "EapMsChapV2NotifierUids.h"
 #include "eap_state_notification.h"
-#include "eap_am_trace_symbian.h"
+#include "EapTraceSymbian.h"
 const TUint KMaxSqlQueryLength = 256;
 const TUint KMaxDBFieldNameLength = 255;
 const char EAP_MSCHAPV2_CREDENTIAL_HANDLE_KEY[] = "eap_type_mschapv2_c credential_store";
 const TInt 	KDefaultColumnInView_One = 1; // For DB view.
 	m_database.Close();
 	m_session.Close();
 	delete m_username_password_io_ptr;
 	delete m_username_password_io_pckg_ptr;
+	if (iEapAuthNotifier != 0)
+		{
+		delete iEapAuthNotifier;
+		iEapAuthNotifier = 0;
+		}
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
 //--------------------------------------------------
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
 		(EAPL("eap_am_type_mschapv2_symbian_c::shutdown(): this = 0x%08x\n"),
 		this));
-	if( IsActive() )
-	{
-		Cancel(); // Cancel only if active.
-	}
-	else
-	{
-		if( m_is_notifier_connected )
-		{
-		EAP_TRACE_DEBUG(
-			m_am_tools,
-			TRACE_FLAGS_DEFAULT,
-			(EAPL("eap_am_type_mschapv2_symbian_c::shutdown - calling m_notifier.CancelNotifier(..)\n")));
-		TInt error = KErrNone;
-		EAP_UNREFERENCED_PARAMETER(error);
-		error = m_notifier.CancelNotifier(KEapMsChapV2UsernamePasswordUid);
-		EAP_TRACE_DEBUG(
-			m_am_tools,
-			TRACE_FLAGS_DEFAULT,
-			(EAPL("eap_am_type_mschapv2_symbian_c::shutdown - calling m_notifier.Close(), prev error=%d\n"),
-			error));
-		m_notifier.Close(); // Call close only if it is connected.
-		m_is_notifier_connected = false;
-		}
-	}
 	m_shutdown_was_called = true;
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
 , m_index(aIndex)
 , m_tunneling_type(aTunnelingType)
 , m_is_client(aIsClient)
 , m_is_valid(false)
 , m_shutdown_was_called(false)
-, m_is_notifier_connected(false)
 , m_max_session_time(0)
+	, iEapAuthNotifier(0)
 {
 	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
-#ifdef USE_EAP_EXPANDED_TYPES
-	m_tunneling_vendor_type = m_tunneling_type.get_vendor_type();
-#else
-	m_tunneling_vendor_type = static_cast<TUint>(m_tunneling_type);
-#endif //#ifdef USE_EAP_EXPANDED_TYPES
 	if (receive_network_id != 0
 		&& receive_network_id->get_is_valid_data() == true)
 	{
 		eap_status_e status = m_receive_network_id.set_copy_of_network_id(
 			receive_network_id);
 	// NOTE: Do not use m_partner here without null check
 	// Open/create the database
 	EapMsChapV2DbUtils::OpenDatabaseL(m_database, m_session, m_index_type, m_index, m_tunneling_type);
-	m_username_password_io_ptr = new(ELeave) TEapMsChapV2UsernamePasswordInfo;
+	m_username_password_io_ptr = new(ELeave) CEapAuthNotifier::TEapDialogInfo;
-	m_username_password_io_pckg_ptr = new(ELeave) TPckg<TEapMsChapV2UsernamePasswordInfo> (*m_username_password_io_ptr);
+	m_username_password_io_pckg_ptr = new(ELeave) TPckg<CEapAuthNotifier::TEapDialogInfo> (*m_username_password_io_ptr);
+		EAP_TRACE_DATA_DEBUG(
+			m_am_tools,
+			TRACE_FLAGS_DEFAULT,
+			(EAPL("eap_am_type_mschapv2_symbian_c::ConstructL m_username_password_io_pckg_ptr"),
+			m_username_password_io_pckg_ptr->Ptr(),
+			m_username_password_io_pckg_ptr->Size()));
 	CActiveScheduler::Add(this);
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
 	m_partner->state_notification(&notification);
 }
 //--------------------------------------------------
+EAP_FUNC_EXPORT void eap_am_type_mschapv2_symbian_c::DlgComplete( TInt aStatus )
-void eap_am_type_mschapv2_symbian_c::RunL()
+	{
-{
+	if (aStatus == KErrCancel)
-	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
+		{
-	EAP_TRACE_DEBUG(
-		m_am_tools,
-		TRACE_FLAGS_DEFAULT,
-		(EAPL("eap_am_type_mschapv2_symbian_c::RunL - start")
-		 EAPL("m_state, iStatus.Int()=%d\n"),
-		 m_state, iStatus.Int()));
-	if (iStatus.Int() == KErrCancel)
-	{
 		EAP_TRACE_DEBUG(
 			m_am_tools,
 			TRACE_FLAGS_DEFAULT,
 			(EAPL("eap_am_type_mschapv2_symbian_c::RunL - User seems to have cancelled the prompt. Stop Immediately.\n")));
 		// Appropriate error notification is sent from finish_unsuccessful_authentication.
 		get_am_partner()->finish_unsuccessful_authentication(true);
 		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 		return;
-	}
+		}
-	if (iStatus.Int() != KErrNone)
+	if (aStatus != KErrNone)
-	{
+		{
 		// Something is very wrong...
 		EAP_TRACE_ERROR(
 			m_am_tools,
 			TRACE_FLAGS_DEFAULT,
-			(EAPL("ERROR: EAP - MS-Chap-V2 notifier or dialog, iStatus.Int()=%d\n"), iStatus.Int()));
+			(EAPL("ERROR: EAP - MS-Chap-V2 notifier or dialog, aStatus=%d\n"), aStatus));
 		send_error_notification(eap_status_authentication_failure);
 		get_am_partner()->finish_unsuccessful_authentication(false);
 		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 		return;
-	}
+		}
 	eap_status_e status(eap_status_ok);
 	switch (m_state)
-	{
+		{
-	case EHandlingUsernamePasswordQuery:
+		case EHandlingUsernamePasswordQuery:
-		{
+			{
 			if (m_username_password_io_ptr->iPasswordPromptEnabled)
-			{
+				{
 				*m_password_prompt_enabled = true;
-			}
+				}
 			else
-			{
+				{
 				*m_password_prompt_enabled = false;
-			}
+				}
-			{
+				{
 				eap_variable_data_c tmp_username_unicode(
 					m_am_tools);
 				status = tmp_username_unicode.set_buffer(
 					m_username_password_io_ptr->iUsername.Ptr(),
 					m_username_password_io_ptr->iUsername.Size(),
 					false,
 					false);
 				if (status != eap_status_ok)
-				{
+					{
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					(void) EAP_STATUS_RETURN(m_am_tools, status);
 					return;
-				}
+					}
 				eap_variable_data_c tmp_username_utf8(m_am_tools);
 				status = m_am_tools->convert_unicode_to_utf8(tmp_username_utf8, tmp_username_unicode);
 				if (status != eap_status_ok)
-				{
+					{
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					(void) EAP_STATUS_RETURN(m_am_tools, status);
 					return;
-				}
+					}
 				status = m_username_utf8->set_copy_of_buffer(&tmp_username_utf8);
 				if (status != eap_status_ok)
-				{
+					{
 					get_am_partner()->finish_unsuccessful_authentication(false);
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					(void) EAP_STATUS_RETURN(m_am_tools, status);
 					return;
+					}
 				}
-			}
+				{
-			{
 				eap_variable_data_c tmp_password_unicode(
 					m_am_tools);
 				status = tmp_password_unicode.set_buffer(
 					m_username_password_io_ptr->iPassword.Ptr(),
 					m_username_password_io_ptr->iPassword.Size(),
 					false,
 					false);
 				if (status != eap_status_ok)
-				{
+					{
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					(void) EAP_STATUS_RETURN(m_am_tools, status);
 					return;
-				}
+					}
 				eap_variable_data_c tmp_password_utf8(m_am_tools);
 				status = m_am_tools->convert_unicode_to_utf8(tmp_password_utf8, tmp_password_unicode);
 				if (status != eap_status_ok)
-				{
+					{
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					(void) EAP_STATUS_RETURN(m_am_tools, status);
 					return;
-				}
+					}
 				status = m_password_utf8->set_copy_of_buffer(&tmp_password_utf8);
 				if (status != eap_status_ok)
-				{
+					{
 					get_am_partner()->finish_unsuccessful_authentication(false);
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					(void) EAP_STATUS_RETURN(m_am_tools, status);
 					return;
+					}
 				}
-			}
 			// Store username and/or password if "Prompt for username" is enabled
 			status = update_username_password();
 			if (status != eap_status_ok)
-			{
+				{
 				get_am_partner()->finish_unsuccessful_authentication(false);
 				EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 				return;
+				}
+			if (m_is_identity_query)
+				{
+				status = get_am_partner()->complete_eap_identity_query();
+				}
+			else
+				{
+				status = get_am_partner()->complete_failure_retry_response();
+				}
 			}
-			if (m_is_identity_query)
-			{
-				status = get_am_partner()->complete_eap_identity_query();
-			}
-			else
-			{
-				status = get_am_partner()->complete_failure_retry_response();
-			}
-		}
 		break;
 	case EHandlingChangePasswordQuery:
 		{
-			{
+				{
 				eap_variable_data_c tmp_password_unicode(
 					m_am_tools);
 				status = tmp_password_unicode.set_buffer(
 					m_username_password_io_ptr->iPassword.Ptr(),
 					m_username_password_io_ptr->iPassword.Size(),
 					false,
 					false);
 				if (status != eap_status_ok)
-				{
+					{
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					(void) EAP_STATUS_RETURN(m_am_tools, status);
 					return;
-				}
+					}
 				eap_variable_data_c tmp_password_utf8(m_am_tools);
 				status = m_am_tools->convert_unicode_to_utf8(tmp_password_utf8, tmp_password_unicode);
 				if (status != eap_status_ok)
-				{
+					{
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					(void) EAP_STATUS_RETURN(m_am_tools, status);
 					return;
-				}
+					}
 				eap_status_e status = m_password_utf8->set_copy_of_buffer(&tmp_password_utf8);
 				if (status != eap_status_ok)
-				{
+					{
 					get_am_partner()->finish_unsuccessful_authentication(false);
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					return;
+					}
 				}
-			}
+				{
-			{
 				eap_variable_data_c tmp_old_password_unicode(
 					m_am_tools);
 				status = tmp_old_password_unicode.set_buffer(
 					m_username_password_io_ptr->iOldPassword.Ptr(),
 					m_username_password_io_ptr->iOldPassword.Size(),
 					false,
 					false);
 				if (status != eap_status_ok)
-				{
+					{
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					(void) EAP_STATUS_RETURN(m_am_tools, status);
 					return;
-				}
+					}
 				eap_variable_data_c tmp_old_password_utf8(m_am_tools);
 				status = m_am_tools->convert_unicode_to_utf8(tmp_old_password_utf8, tmp_old_password_unicode);
 				if (status != eap_status_ok)
-				{
+					{
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					(void) EAP_STATUS_RETURN(m_am_tools, status);
 					return;
-				}
+					}
 				status = m_old_password_utf8->set_copy_of_buffer(&tmp_old_password_utf8);
 				if (status != eap_status_ok)
-				{
+					{
 					get_am_partner()->finish_unsuccessful_authentication(false);
 					EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 					return;
+					}
 				}
+			status = get_am_partner()->complete_change_password_query();
 			}
-			status = get_am_partner()->complete_change_password_query();
-		}
 		break;
 	default:
 		EAP_TRACE_ERROR(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("ERROR: EAP - MS-Chap-V2 illegal state in RunL.\n")));
 		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 		return;
-	}
+		}
+	}
+//--------------------------------------------------
+void eap_am_type_mschapv2_symbian_c::RunL()
+{
+	EAP_TRACE_BEGIN(m_am_tools, TRACE_FLAGS_DEFAULT);
+	EAP_TRACE_DEBUG(
+		m_am_tools,
+		TRACE_FLAGS_DEFAULT,
+		(EAPL("eap_am_type_mschapv2_symbian_c::RunL - start")
+		 EAPL("m_state, iStatus.Int()=%d\n"),
+		 m_state, iStatus.Int()));
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 }
 //--------------------------------------------------
 void eap_am_type_mschapv2_symbian_c::DoCancel()
 {
-	if( m_is_notifier_connected )
+	if (iEapAuthNotifier != 0)
-	{
+		{
-	EAP_TRACE_DEBUG(
+		iEapAuthNotifier->Cancel();
-		m_am_tools,
+		}
-		TRACE_FLAGS_DEFAULT,
-		(EAPL("eap_am_type_mschapv2_symbian_c::DoCancel - calling m_notifier.CancelNotifier(..)\n")));
+	}
-		TInt error = KErrNone;
-		EAP_UNREFERENCED_PARAMETER(error);
-		error = m_notifier.CancelNotifier(KEapMsChapV2UsernamePasswordUid);
-	EAP_TRACE_DEBUG(
-		m_am_tools,
-		TRACE_FLAGS_DEFAULT,
-		(EAPL("eap_am_type_mschapv2_symbian_c::DoCancel - calling m_notifier.Close(), prev error=%d\n"),
-		error));
-		m_notifier.Close(); // Call close only if it is connected.
-		m_is_notifier_connected = false;
-	}
-}
 //--------------------------------------------------
 EAP_FUNC_EXPORT eap_status_e eap_am_type_mschapv2_symbian_c::type_configure_read(
 	// Now do the database query
 	HBufC* buf = HBufC::NewLC(KMaxSqlQueryLength);
 	TPtr sqlStatement = buf->Des();
-	_LIT(KSQLQueryRow, "SELECT %S FROM %S WHERE %S=%d AND %S=%d AND %S=%d");
+	_LIT(KSQLQueryRow, "SELECT %S FROM %S WHERE %S=%d AND %S=%d AND %S=%d AND %S=%d");
-	sqlStatement.Format(KSQLQueryRow,
+	sqlStatement.Format(
-						&unicodeString,
+		KSQLQueryRow,
-						&KMsChapV2TableName,
+		&unicodeString,
-						&KServiceType,
+		&KMsChapV2TableName,
-						m_index_type,
+		&KServiceType,
-						&KServiceIndex,
+		m_index_type,
-						m_index,
+		&KServiceIndex,
-						&KTunnelingType,
+		m_index,
-						m_tunneling_vendor_type);
+		&KTunnelingTypeVendorId,
+		m_tunneling_type.get_vendor_id(),
+		&KTunnelingType,
+		m_tunneling_type.get_vendor_type());
 	RDbView view;
 	User::LeaveIfError(view.Prepare(m_database, TDbQuery(sqlStatement), TDbWindow::EUnlimited));
 	CleanupClosePushL(view);
 	User::LeaveIfError(view.EvaluateAll());
 	// Now do the database update
 	HBufC* buf = HBufC::NewLC(KMaxSqlQueryLength);
 	TPtr sqlStatement = buf->Des();
-	_LIT(KSQLUpdate, "SELECT %S,%S,%S FROM %S WHERE %S=%d AND %S=%d AND %S=%d");
+	_LIT(KSQLUpdate, "SELECT %S,%S,%S FROM %S WHERE %S=%d AND %S=%d AND %S=%d AND %S=%d");
-	sqlStatement.Format(KSQLUpdate,
+	sqlStatement.Format(
-						&cf_str_EAP_MSCHAPV2_username_literal,
+		KSQLUpdate,
-						&cf_str_EAP_MSCHAPV2_password_prompt_literal,
+		&cf_str_EAP_MSCHAPV2_username_literal,
-						&cf_str_EAP_MSCHAPV2_password_literal,
+		&cf_str_EAP_MSCHAPV2_password_prompt_literal,
-						&KMsChapV2TableName,
+		&cf_str_EAP_MSCHAPV2_password_literal,
-						&KServiceType,
+		&KMsChapV2TableName,
-						m_index_type,
+		&KServiceType,
-						&KServiceIndex,
+		m_index_type,
-						m_index,
+		&KServiceIndex,
-						&KTunnelingType,
+		m_index,
-						m_tunneling_vendor_type);
+		&KTunnelingTypeVendorId,
+		m_tunneling_type.get_vendor_id(),
+		&KTunnelingType,
+		m_tunneling_type.get_vendor_type());
 	RDbView view;
 	User::LeaveIfError(view.Prepare(m_database, TDbQuery(sqlStatement), RDbView::EUpdatable));
 	CleanupClosePushL(view);
 	}
 	if (*m_password_prompt_enabled)
 	{
 		// Username and password prompt flag is stored, password is cleared
-		view.SetColL(colSet->ColNo(cf_str_EAP_MSCHAPV2_password_prompt_literal), EMSCHAPV2PasswordPromptOn);
+		view.SetColL(colSet->ColNo(cf_str_EAP_MSCHAPV2_password_prompt_literal), EEapDbTrue);
 		view.SetColNullL(colSet->ColNo(cf_str_EAP_MSCHAPV2_password_literal));
 	}
 	else
 	{
 		eap_variable_data_c tmp_password_unicode(m_am_tools);
 			password.Length()));
 			User::Leave(KErrArgument);
 		}
-		view.SetColL(colSet->ColNo(cf_str_EAP_MSCHAPV2_password_prompt_literal), EMSCHAPV2PasswordPromptOff);
+		view.SetColL(colSet->ColNo(cf_str_EAP_MSCHAPV2_password_prompt_literal), EEapDbFalse);
 		// Length is ok. Set the value in DB.
 		view.SetColL(colSet->ColNo(cf_str_EAP_MSCHAPV2_password_literal), password);
 	}
 	m_username_utf8 = &username_utf8;
 	m_password_utf8 = &password_utf8;
 	m_password_prompt_enabled = &password_prompt_enabled;
 	m_is_identity_query = is_identity_query;
-	if (!IsActive())
-	{
 		if (*m_password_prompt_enabled == true)
-		{
+			{
 			m_username_password_io_ptr->iPasswordPromptEnabled = ETrue;
-		}
+			}
 		else
-		{
+			{
 			m_username_password_io_ptr->iPasswordPromptEnabled = EFalse;
-		}
+			}
 		if (m_is_identity_query == true)
-		{
+			{
 			m_username_password_io_ptr->iIsIdentityQuery = ETrue;
-		}
+			}
 		else
-		{
+			{
 			m_username_password_io_ptr->iIsIdentityQuery = EFalse;
-		}
+			}
-		{
+		eap_variable_data_c tmp_username_unicode(m_am_tools);
-			eap_variable_data_c tmp_username_unicode(m_am_tools);
+		eap_status_e status = m_am_tools->convert_utf8_to_unicode(tmp_username_unicode, *m_username_utf8);
-			eap_status_e status = m_am_tools->convert_utf8_to_unicode(tmp_username_unicode, *m_username_utf8);
+		if (status != eap_status_ok)
-			if (status != eap_status_ok)
 			{
-				EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
+			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
-				return EAP_STATUS_RETURN(m_am_tools, status);
+			return EAP_STATUS_RETURN(m_am_tools, status);
 			}
-			m_username_password_io_ptr->iUsername.Copy(
+		m_username_password_io_ptr->iUsername.Copy(
-				reinterpret_cast<TUint16 *> (
+			reinterpret_cast<TUint16 *> (
-					tmp_username_unicode.get_data(tmp_username_unicode.get_data_length())),
+				tmp_username_unicode.get_data(tmp_username_unicode.get_data_length())),
-					tmp_username_unicode.get_data_length() / 2); // 8bit -> 16bit
+				tmp_username_unicode.get_data_length() / 2); // 8bit -> 16bit
-		}
 		m_state = EHandlingUsernamePasswordQuery;
-	EAP_TRACE_DEBUG(
-		m_am_tools,
-		TRACE_FLAGS_DEFAULT,
-		(EAPL(" eap_am_type_mschapv2_symbian_c::show_username_password_dialog - before m_notifier.Connect(), m_is_notifier_connected=%d\n"),
-		m_is_notifier_connected));
-		if( !m_is_notifier_connected )
-		{
-			TInt error = m_notifier.Connect();
-	EAP_TRACE_DEBUG(
-		m_am_tools,
-		TRACE_FLAGS_DEFAULT,
-		(EAPL(" eap_am_type_mschapv2_symbian_c::show_username_password_dialog - m_notifier.Connect() returned error=%d\n"),
-		error));
-			if( error != KErrNone)
-			{
-				// Can not connect to notifier.
-				return EAP_STATUS_RETURN(m_am_tools, m_am_tools->convert_am_error_to_eapol_error(error));
-			}
-			m_is_notifier_connected = true; // Got connectted to notifier.
-		}
 	EAP_TRACE_DEBUG(
 		m_am_tools,
 		TRACE_FLAGS_DEFAULT,
 		(EAPL(" eap_am_type_mschapv2_symbian_c::show_username_password_dialog - before m_notifier.StartNotifierAndGetResponse()\n")));
-		m_notifier.StartNotifierAndGetResponse(
+	    TEapExpandedType aEapType(*EapExpandedTypeFast.GetType());
-			iStatus,
-			KEapMsChapV2UsernamePasswordUid,
+	    m_username_password_io_ptr->iPassword.Zero();
-			*m_username_password_io_pckg_ptr,
-			*m_username_password_io_pckg_ptr);
+	    if (iEapAuthNotifier == 0)
+	    	{
-		SetActive();
+	    	TRAPD(err, iEapAuthNotifier = CEapAuthNotifier::NewL( *this ));
-	}
+	  		if (err)
-	else
+	  			{
-	{
+	  				return eap_status_authentication_failure;
-		EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("eap_am_type_mschapv2_symbian_c: Already active when tried to show username/password dialog.\n")));
+	  			}
-		return eap_status_process_general_error;
+	    	}
-	}
+	    else
+		   	{
+			 	iEapAuthNotifier->Cancel();
+	     	}
+	    TRAPD(err1, iEapAuthNotifier->StartL(CEapAuthNotifier::EEapNotifierTypeMsChapV2UsernamePasswordDialog, m_username_password_io_ptr, aEapType));
+		if (err1)
+			{
+				return eap_status_authentication_failure;
+			}
 	return eap_status_pending_request;
 }
 //--------------------------------------------------
 	m_username_utf8 = &username;
 	m_password_utf8 = &password;
 	m_old_password_utf8 = &old_password;
 	m_password_prompt_enabled = &password_prompt_enabled;
-	if (!IsActive())
-	{
-		{
-			eap_variable_data_c tmp_username_unicode(m_am_tools);
-			eap_status_e status = m_am_tools->convert_utf8_to_unicode(tmp_username_unicode, *m_username_utf8);
-			if (status != eap_status_ok)
-			{
-				EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
-				return EAP_STATUS_RETURN(m_am_tools, status);
-			}
-			m_username_password_io_ptr->iUsername.Copy(
-				reinterpret_cast<TUint16 *> (
-					tmp_username_unicode.get_data(tmp_username_unicode.get_data_length())),
-					tmp_username_unicode.get_data_length() / 2); // 8bit -> 16bit
-		}
-		m_state = EHandlingChangePasswordQuery;
-	EAP_TRACE_DEBUG(
-		m_am_tools,
-		TRACE_FLAGS_DEFAULT,
-		(EAPL(" eap_am_type_mschapv2_symbian_c::show_change_password_dialog - before m_notifier.Connect(), m_is_notifier_connected=%d\n"),
-		m_is_notifier_connected));
-		if( !m_is_notifier_connected )
-		{
-			TInt error = m_notifier.Connect();
-	EAP_TRACE_DEBUG(
-		m_am_tools,
-		TRACE_FLAGS_DEFAULT,
-		(EAPL(" eap_am_type_mschapv2_symbian_c::show_change_password_dialog - m_notifier.Connect() returned error=%d\n"),
-		error));
-			if( error != KErrNone)
-			{
-				// Can not connect to notifier.
-				return EAP_STATUS_RETURN(m_am_tools, m_am_tools->convert_am_error_to_eapol_error(error));
-			}
-			m_is_notifier_connected = true; // Got connectted to notifier.
-		}
-	EAP_TRACE_DEBUG(
-		m_am_tools,
-		TRACE_FLAGS_DEFAULT,
-		(EAPL(" eap_am_type_mschapv2_symbian_c::show_change_password_dialog - before m_notifier.StartNotifierAndGetResponse()\n")));
-		m_notifier.StartNotifierAndGetResponse(
-			iStatus,
-			KEapMsChapV2ChangePasswordUid,
-			*m_username_password_io_pckg_ptr,
-			*m_username_password_io_pckg_ptr);
-		SetActive();
-	}
-	else
-	{
-		EAP_TRACE_DEBUG(m_am_tools, TRACE_FLAGS_DEFAULT, (EAPL("eap_am_type_mschapv2_symbian_c: Already active when tried to show change password dialog.\n")));
-		return eap_status_process_general_error;
-	}
 	return eap_status_pending_request;
 #endif
 }
 	{
 		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 		return EAP_STATUS_RETURN(m_am_tools, status);
 	}
-	status = memory_store_key->add_data(
+	{
-		&m_tunneling_vendor_type,
+		u32_t vendor_id = m_tunneling_type.get_vendor_id();
-		sizeof(m_tunneling_vendor_type));
-	if (status != eap_status_ok)
+		status = memory_store_key->add_data(
-	{
+			&vendor_id,
-		EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
+			sizeof(vendor_id));
-		return EAP_STATUS_RETURN(m_am_tools, status);
+		if (status != eap_status_ok)
+		{
+			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
+			return EAP_STATUS_RETURN(m_am_tools, status);
+		}
+	}
+	{
+		u32_t vendor_type = m_tunneling_type.get_vendor_type();
+		status = memory_store_key->add_data(
+			&vendor_type,
+			sizeof(vendor_type));
+		if (status != eap_status_ok)
+		{
+			EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
+			return EAP_STATUS_RETURN(m_am_tools, status);
+		}
 	}
 	EAP_TRACE_END(m_am_tools, TRACE_FLAGS_DEFAULT);
 	return EAP_STATUS_RETURN(m_am_tools, status);
 }
 	HBufC* buf = HBufC::NewLC(KMaxSqlQueryLength);
 	TPtr sqlStatement = buf->Des();
 	// Query all the relevant parameters
-	_LIT(KSQLQuery, "SELECT %S, %S FROM %S WHERE %S=%d AND %S=%d AND %S=%d");
+	_LIT(KSQLQuery, "SELECT %S, %S FROM %S WHERE %S=%d AND %S=%d AND %S=%d AND %S=%d");
-	sqlStatement.Format(KSQLQuery, &cf_str_EAP_MSCHAPv2_max_session_validity_time_literal,
+	sqlStatement.Format(
-						&KMSCHAPv2LastFullAuthTime, &KMsChapV2TableName,
+		KSQLQuery,
-						&KServiceType, m_index_type,
+		&cf_str_EAP_MSCHAPv2_max_session_validity_time_literal,
-						&KServiceIndex, m_index, &KTunnelingType, m_tunneling_vendor_type);
+		&KMSCHAPv2LastFullAuthTime,
+		&KMsChapV2TableName,
+		&KServiceType,
+		m_index_type,
+		&KServiceIndex,
+		m_index,
+		&KTunnelingTypeVendorId,
+		m_tunneling_type.get_vendor_id(),
+		&KTunnelingType,
+		m_tunneling_type.get_vendor_type());
 	RDbView view;
 	// Evaluate view
 	User::LeaveIfError(view.Prepare(m_database, TDbQuery(sqlStatement)));
 	CleanupClosePushL(view);
 	HBufC* buf = HBufC::NewLC(KMaxSqlQueryLength);
 	TPtr sqlStatement = buf->Des();
 	// Query all the relevant parameters
-	_LIT(KSQLQuery, "SELECT %S FROM %S WHERE %S=%d AND %S=%d AND %S=%d");
+	_LIT(KSQLQuery, "SELECT %S FROM %S WHERE %S=%d AND %S=%d AND %S=%d AND %S=%d");
-	sqlStatement.Format(KSQLQuery, &KMSCHAPv2LastFullAuthTime, &KMsChapV2TableName,
+	sqlStatement.Format(
-						&KServiceType, m_index_type,
+		KSQLQuery,
-						&KServiceIndex, m_index, &KTunnelingType, m_tunneling_vendor_type);
+		&KMSCHAPv2LastFullAuthTime,
+		&KMsChapV2TableName,
+		&KServiceType,
+		m_index_type,
+		&KServiceIndex,
+		m_index,
+		&KTunnelingTypeVendorId,
+		m_tunneling_type.get_vendor_id(),
+		&KTunnelingType,
+		m_tunneling_type.get_vendor_type());
 	RDbView view;
 	// Evaluate view
 	User::LeaveIfError(view.Prepare(m_database, TDbQuery(sqlStatement), TDbWindow::EUnlimited));
 	CleanupClosePushL(view);

changeset 26	9abfd4f00d37
parent 2	1c7bc153c08e
child 34	ad1f037f1ac2