From 034b64f4153550cbe5849bcbfc27e187377cc512 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Thu, 29 Jun 2023 00:06:20 +0200
Subject: EMV keyfile support: Overall code improvements and bug fixes

---
 src/Main/Forms/SecurityTokenKeyfilesDialog.cpp | 52 ++++++++++++++------------
 1 file changed, 28 insertions(+), 24 deletions(-)

(limited to 'src/Main/Forms/SecurityTokenKeyfilesDialog.cpp')

diff --git a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
index 2c5896a7..d78e22fd 100644
--- a/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
+++ b/src/Main/Forms/SecurityTokenKeyfilesDialog.cpp
@@ -53,7 +53,7 @@ namespace VeraCrypt
 		wxBusyCursor busy;
 
 		SecurityTokenKeyfileListCtrl->DeleteAllItems();
-		SecurityTokenKeyfileList = Token::GetAvailableKeyfiles(Gui->GetPreferences().ActivateEMVOption);
+		SecurityTokenKeyfileList = Token::GetAvailableKeyfiles(Gui->GetPreferences().EMVSupportEnabled);
 
 		size_t i = 0;
 		foreach (const shared_ptr<TokenKeyfile> key, SecurityTokenKeyfileList)
@@ -177,34 +177,38 @@ namespace VeraCrypt
 		}
 	}
 
-    void SecurityTokenKeyfilesDialog::OnListItemSelected(wxListEvent &event) {
-        if (event.GetItem().GetData() != (wxUIntPtr) nullptr) {
-            BOOL deletable = true;
-            foreach(long
-            item, Gui->GetListCtrlSelectedItems(SecurityTokenKeyfileListCtrl))
-            {
-                TokenKeyfile *keyfile = reinterpret_cast <TokenKeyfile *> (SecurityTokenKeyfileListCtrl->GetItemData(
-                        item));
-                if (!keyfile->Token->isEditable()) {
-                    deletable = false;
-                }
-            }
-            if (deletable) {
-                DeleteButton->Enable();
-            }
-            ExportButton->Enable();
-            OKButton->Enable();
-        }
-    }
+	void SecurityTokenKeyfilesDialog::OnListItemSelected(wxListEvent &event)
+	{
+		if (event.GetItem().GetData() != (wxUIntPtr) nullptr)
+		{
+			BOOL deletable = true;
+			foreach(long
+			item, Gui->GetListCtrlSelectedItems(SecurityTokenKeyfileListCtrl))
+			{
+				TokenKeyfile *keyfile = reinterpret_cast <TokenKeyfile *> (SecurityTokenKeyfileListCtrl->GetItemData(item));
+				if (!keyfile->Token->isEditable())
+				{
+					deletable = false;
+					break;
+				}
+			}
+			if (deletable)
+			{
+				DeleteButton->Enable();
+			}
+			ExportButton->Enable();
+			OKButton->Enable();
+		}
+	}
 
 	void SecurityTokenKeyfilesDialog::OnOKButtonClick ()
 	{
 		foreach (long item, Gui->GetListCtrlSelectedItems (SecurityTokenKeyfileListCtrl))
-        {
-            TokenKeyfile *key = reinterpret_cast <TokenKeyfile *> (SecurityTokenKeyfileListCtrl->GetItemData(item));
+		{
+			TokenKeyfile *key = reinterpret_cast <TokenKeyfile *> (SecurityTokenKeyfileListCtrl->GetItemData(item));
 
-            SelectedSecurityTokenKeyfilePaths.push_back(*key);
-        }
+			SelectedSecurityTokenKeyfilePaths.push_back(*key);
+		}
 		EndModal (wxID_OK);
 	}
 }
-- 
cgit v1.2.3