5 files changed, 59 insertions, 49 deletions
diff --git a/src/Volume/Keyfile.cpp b/src/Volume/Keyfile.cpp
index 9527fd11..24b40709 100644
--- a/src/Volume/Keyfile.cpp
+++ b/src/Volume/Keyfile.cpp
@@ -18,7 +18,7 @@
 #include "VolumeException.h"
 namespace VeraCrypt
 {
-	void Keyfile::Apply (const BufferPtr &pool, bool EMVOption) const
+	void Keyfile::Apply (const BufferPtr &pool, bool emvSupportEnabled) const
 	{
 		if (Path.IsDirectory())
 			throw ParameterIncorrect (SRC_POS);
@@ -32,57 +32,60 @@ namespace VeraCrypt
 
 		SecureBuffer keyfileBuf (File::GetOptimalReadSize());
 
-        std::wcout << wstring (Path) << std::endl;
-        if (Token::IsKeyfilePathValid (Path, EMVOption)) {
-            // Apply keyfile generated by a security token
-            vector <byte> keyfileData;
-            Token::getTokenKeyfile(wstring(Path))->GetKeyfileData(keyfileData);
+		if (Token::IsKeyfilePathValid (Path, emvSupportEnabled))
+		{
+			// Apply keyfile generated by a security token
+			vector <byte> keyfileData;
+			Token::getTokenKeyfile(wstring(Path))->GetKeyfileData(keyfileData);
 
-            if (keyfileData.size() < MinProcessedLength)
-                throw InsufficientData(SRC_POS, Path);
+			if (keyfileData.size() < MinProcessedLength)
+				throw InsufficientData(SRC_POS, Path);
 
-            for (size_t i = 0; i < keyfileData.size(); i++) {
-                uint32 crc = crc32.Process(keyfileData[i]);
+			for (size_t i = 0; i < keyfileData.size(); i++)
+			{
+				uint32 crc = crc32.Process(keyfileData[i]);
 
-                pool[poolPos++] += (byte)(crc >> 24);
-                pool[poolPos++] += (byte)(crc >> 16);
-                pool[poolPos++] += (byte)(crc >> 8);
-                pool[poolPos++] += (byte) crc;
+				pool[poolPos++] += (byte)(crc >> 24);
+				pool[poolPos++] += (byte)(crc >> 16);
+				pool[poolPos++] += (byte)(crc >> 8);
+				pool[poolPos++] += (byte) crc;
 
-                if (poolPos >= pool.Size())
-                    poolPos = 0;
+				if (poolPos >= pool.Size())
+					poolPos = 0;
 
-                if (++totalLength >= MaxProcessedLength)
-                    break;
-            }
+				if (++totalLength >= MaxProcessedLength)
+					break;
+			}
 
 
-            burn(&keyfileData.front(), keyfileData.size());
-            goto  done;
-        }
+			burn(&keyfileData.front(), keyfileData.size());
+			goto  done;
+		}
 
-        file.Open (Path, File::OpenRead, File::ShareRead);
+		file.Open (Path, File::OpenRead, File::ShareRead);
 
-        while ((readLength = file.Read (keyfileBuf)) > 0) {
-            for (size_t i = 0; i < readLength; i++) {
-                uint32 crc = crc32.Process(keyfileBuf[i]);
-                pool[poolPos++] += (byte)(crc >> 24);
-                pool[poolPos++] += (byte)(crc >> 16);
-                pool[poolPos++] += (byte)(crc >> 8);
-                pool[poolPos++] += (byte) crc;
-                if (poolPos >= pool.Size())
-                    poolPos = 0;
-                if (++totalLength >= MaxProcessedLength)
-                    goto done;
-            }
-        }
-        done:
+		while ((readLength = file.Read (keyfileBuf)) > 0)
+		{
+			for (size_t i = 0; i < readLength; i++)
+			{
+				uint32 crc = crc32.Process(keyfileBuf[i]);
+				pool[poolPos++] += (byte)(crc >> 24);
+				pool[poolPos++] += (byte)(crc >> 16);
+				pool[poolPos++] += (byte)(crc >> 8);
+				pool[poolPos++] += (byte) crc;
+				if (poolPos >= pool.Size())
+					poolPos = 0;
+				if (++totalLength >= MaxProcessedLength)
+					goto done;
+			}
+		}
+		done:
 
 		if (totalLength < MinProcessedLength)
 			throw InsufficientData (SRC_POS, Path);
 	}
 
-	shared_ptr <VolumePassword> Keyfile::ApplyListToPassword (shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> password, bool EMVOption)
+	shared_ptr <VolumePassword> Keyfile::ApplyListToPassword (shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> password, bool emvSupportEnabled)
 	{
 		if (!password)
 			password.reset (new VolumePassword);
@@ -139,7 +142,7 @@ namespace VeraCrypt
 			// Apply all keyfiles
 			foreach_ref (const Keyfile &k, keyfilesExp)
 			{
-				k.Apply (keyfilePool, EMVOption);
+				k.Apply (keyfilePool, emvSupportEnabled);
 			}
 
 			newPassword->Set (keyfilePool);
diff --git a/src/Volume/Keyfile.h b/src/Volume/Keyfile.h
index bf0a524b..1d87a983 100644
--- a/src/Volume/Keyfile.h
+++ b/src/Volume/Keyfile.h
@@ -29,7 +29,7 @@ namespace VeraCrypt
 		virtual ~Keyfile () { };
 
 		operator FilesystemPath () const { return Path; }
-		static shared_ptr <VolumePassword> ApplyListToPassword (shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> password, bool EMVOption = false);
+		static shared_ptr <VolumePassword> ApplyListToPassword (shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> password, bool emvSupportEnabled = false);
 		static shared_ptr <KeyfileList> DeserializeList (shared_ptr <Stream> stream, const string &name);
 		static void SerializeList (shared_ptr <Stream> stream, const string &name, shared_ptr <KeyfileList> keyfiles);
 		static bool WasHiddenFilePresentInKeyfilePath() { bool r = HiddenFileWasPresentInKeyfilePath; HiddenFileWasPresentInKeyfilePath = false; return r; }
@@ -38,7 +38,7 @@ namespace VeraCrypt
 		static const size_t MaxProcessedLength = 1024 * 1024;
 
 	protected:
-		void Apply (const BufferPtr &pool, bool EMVOption) const;
+		void Apply (const BufferPtr &pool, bool emvSupportEnabled) const;
 
 		static bool HiddenFileWasPresentInKeyfilePath;
 
diff --git a/src/Volume/Volume.cpp b/src/Volume/Volume.cpp
index 6fb906b6..57707726 100644
--- a/src/Volume/Volume.cpp
+++ b/src/Volume/Volume.cpp
@@ -71,7 +71,7 @@ namespace VeraCrypt
 		return EA->GetMode();
 	}
 
-	void Volume::Open (const VolumePath &volumePath, bool preserveTimestamps, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> kdf, bool truecryptMode, shared_ptr <KeyfileList> keyfiles, bool EMVOption, VolumeProtection::Enum protection, shared_ptr <VolumePassword> protectionPassword, int protectionPim, shared_ptr <Pkcs5Kdf> protectionKdf, shared_ptr <KeyfileList> protectionKeyfiles, bool sharedAccessAllowed, VolumeType::Enum volumeType, bool useBackupHeaders, bool partitionInSystemEncryptionScope)
+	void Volume::Open (const VolumePath &volumePath, bool preserveTimestamps, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> kdf, bool truecryptMode, shared_ptr <KeyfileList> keyfiles, bool emvSupportEnabled, VolumeProtection::Enum protection, shared_ptr <VolumePassword> protectionPassword, int protectionPim, shared_ptr <Pkcs5Kdf> protectionKdf, shared_ptr <KeyfileList> protectionKeyfiles, bool sharedAccessAllowed, VolumeType::Enum volumeType, bool useBackupHeaders, bool partitionInSystemEncryptionScope)
 	{
 		make_shared_auto (File, file);
 
@@ -102,10 +102,10 @@ namespace VeraCrypt
 				throw;
 		}
 
-		return Open (file, password, pim, kdf, truecryptMode, keyfiles, EMVOption, protection, protectionPassword, protectionPim, protectionKdf,protectionKeyfiles, volumeType, useBackupHeaders, partitionInSystemEncryptionScope);
+		return Open (file, password, pim, kdf, truecryptMode, keyfiles, emvSupportEnabled, protection, protectionPassword, protectionPim, protectionKdf,protectionKeyfiles, volumeType, useBackupHeaders, partitionInSystemEncryptionScope);
 	}
 
-	void Volume::Open (shared_ptr <File> volumeFile, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> kdf, bool truecryptMode, shared_ptr <KeyfileList> keyfiles, bool EMVOption, VolumeProtection::Enum protection, shared_ptr <VolumePassword> protectionPassword, int protectionPim, shared_ptr <Pkcs5Kdf> protectionKdf,shared_ptr <KeyfileList> protectionKeyfiles, VolumeType::Enum volumeType, bool useBackupHeaders, bool partitionInSystemEncryptionScope)
+	void Volume::Open (shared_ptr <File> volumeFile, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> kdf, bool truecryptMode, shared_ptr <KeyfileList> keyfiles, bool emvSupportEnabled, VolumeProtection::Enum protection, shared_ptr <VolumePassword> protectionPassword, int protectionPim, shared_ptr <Pkcs5Kdf> protectionKdf,shared_ptr <KeyfileList> protectionKeyfiles, VolumeType::Enum volumeType, bool useBackupHeaders, bool partitionInSystemEncryptionScope)
 	{
 		if (!volumeFile)
 			throw ParameterIncorrect (SRC_POS);
@@ -121,7 +121,7 @@ namespace VeraCrypt
 		try
 		{
 			VolumeHostSize = VolumeFile->Length();
-			shared_ptr <VolumePassword> passwordKey = Keyfile::ApplyListToPassword (keyfiles, password, EMVOption);
+			shared_ptr <VolumePassword> passwordKey = Keyfile::ApplyListToPassword (keyfiles, password, emvSupportEnabled);
 
 			bool skipLayoutV1Normal = false;
 
@@ -249,7 +249,7 @@ namespace VeraCrypt
 
 								protectedVolume.Open (VolumeFile,
 									protectionPassword, protectionPim, protectionKdf, truecryptMode, protectionKeyfiles,
-                                    EMVOption,
+									emvSupportEnabled,
 									VolumeProtection::ReadOnly,
 									shared_ptr <VolumePassword> (), 0, shared_ptr <Pkcs5Kdf> (),shared_ptr <KeyfileList> (),
 									VolumeType::Hidden,
diff --git a/src/Volume/Volume.h b/src/Volume/Volume.h
index 85fdbe41..e50dd0e7 100644
--- a/src/Volume/Volume.h
+++ b/src/Volume/Volume.h
@@ -123,8 +123,8 @@ namespace VeraCrypt
 		uint64 GetVolumeCreationTime () const { return Header->GetVolumeCreationTime(); }
 		bool IsHiddenVolumeProtectionTriggered () const { return HiddenVolumeProtectionTriggered; }
 		bool IsInSystemEncryptionScope () const { return SystemEncryption; }
-		void Open (const VolumePath &volumePath, bool preserveTimestamps, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> kdf, bool truecryptMode, shared_ptr <KeyfileList> keyfiles, bool EMVOption, VolumeProtection::Enum protection = VolumeProtection::None, shared_ptr <VolumePassword> protectionPassword = shared_ptr <VolumePassword> (), int protectionPim = 0, shared_ptr <Pkcs5Kdf> protectionKdf = shared_ptr <Pkcs5Kdf> (),shared_ptr <KeyfileList> protectionKeyfiles = shared_ptr <KeyfileList> (), bool sharedAccessAllowed = false, VolumeType::Enum volumeType = VolumeType::Unknown, bool useBackupHeaders = false, bool partitionInSystemEncryptionScope = false);
-		void Open (shared_ptr <File> volumeFile, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> kdf, bool truecryptMode, shared_ptr <KeyfileList> keyfiles, bool EMVOption, VolumeProtection::Enum protection = VolumeProtection::None, shared_ptr <VolumePassword> protectionPassword = shared_ptr <VolumePassword> (), int protectionPim = 0, shared_ptr <Pkcs5Kdf> protectionKdf = shared_ptr <Pkcs5Kdf> (), shared_ptr <KeyfileList> protectionKeyfiles = shared_ptr <KeyfileList> (), VolumeType::Enum volumeType = VolumeType::Unknown, bool useBackupHeaders = false, bool partitionInSystemEncryptionScope = false);
+		void Open (const VolumePath &volumePath, bool preserveTimestamps, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> kdf, bool truecryptMode, shared_ptr <KeyfileList> keyfiles, bool emvSupportEnabled, VolumeProtection::Enum protection = VolumeProtection::None, shared_ptr <VolumePassword> protectionPassword = shared_ptr <VolumePassword> (), int protectionPim = 0, shared_ptr <Pkcs5Kdf> protectionKdf = shared_ptr <Pkcs5Kdf> (),shared_ptr <KeyfileList> protectionKeyfiles = shared_ptr <KeyfileList> (), bool sharedAccessAllowed = false, VolumeType::Enum volumeType = VolumeType::Unknown, bool useBackupHeaders = false, bool partitionInSystemEncryptionScope = false);
+		void Open (shared_ptr <File> volumeFile, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> kdf, bool truecryptMode, shared_ptr <KeyfileList> keyfiles, bool emvSupportEnabled, VolumeProtection::Enum protection = VolumeProtection::None, shared_ptr <VolumePassword> protectionPassword = shared_ptr <VolumePassword> (), int protectionPim = 0, shared_ptr <Pkcs5Kdf> protectionKdf = shared_ptr <Pkcs5Kdf> (), shared_ptr <KeyfileList> protectionKeyfiles = shared_ptr <KeyfileList> (), VolumeType::Enum volumeType = VolumeType::Unknown, bool useBackupHeaders = false, bool partitionInSystemEncryptionScope = false);
 		void ReadSectors (const BufferPtr &buffer, uint64 byteOffset);
 		void ReEncryptHeader (bool backupHeader, const ConstBufferPtr &newSalt, const ConstBufferPtr &newHeaderKey, shared_ptr <Pkcs5Kdf> newPkcs5Kdf);
 		void WriteSectors (const ConstBufferPtr &buffer, uint64 byteOffset);
diff --git a/src/Volume/Volume.make b/src/Volume/Volume.make
index 03e06eaa..d69ec135 100644
--- a/src/Volume/Volume.make
+++ b/src/Volume/Volume.make
@@ -96,15 +96,22 @@ OBJS += ../Crypto/kuznyechik_simd.o
 
 OBJSNOOPT += ../Crypto/jitterentropy-base.o0
 
+OBJS += ../Common/CommandAPDU.o
+OBJS += ../Common/PCSCException.o
+OBJS += ../Common/ResponseAPDU.o
+OBJS += ../Common/SCard.o
+OBJS += ../Common/SCardLoader.o
+OBJS += ../Common/SCardManager.o
+OBJS += ../Common/SCardReader.o
 OBJS += ../Common/Token.o
 OBJS += ../Common/Crc.o
 OBJS += ../Common/TLVParser.o
+OBJS += ../Common/EMVCard.o
 OBJS += ../Common/EMVToken.o
 OBJS += ../Common/Endian.o
 OBJS += ../Common/GfMul.o
 OBJS += ../Common/Pkcs5.o
 OBJS += ../Common/SecurityToken.o
-OBJS += ../Common/IccDataExtractor.o
 
 VolumeLibrary: Volume.a