1 files changed, 40 insertions, 44 deletions
diff --git a/src/Volume/Keyfile.cpp b/src/Volume/Keyfile.cpp
index d171458c..9527fd11 100644
--- a/src/Volume/Keyfile.cpp
+++ b/src/Volume/Keyfile.cpp
@@ -12,13 +12,13 @@
 
 #include "Platform/Serializer.h"
 #include "Common/SecurityToken.h"
+#include "Common/EMVToken.h"
 #include "Crc32.h"
 #include "Keyfile.h"
 #include "VolumeException.h"
-
 namespace VeraCrypt
 {
-	void Keyfile::Apply (const BufferPtr &pool) const
+	void Keyfile::Apply (const BufferPtr &pool, bool EMVOption) const
 	{
 		if (Path.IsDirectory())
 			throw ParameterIncorrect (SRC_POS);
@@ -32,61 +32,57 @@ namespace VeraCrypt
 
 		SecureBuffer keyfileBuf (File::GetOptimalReadSize());
 
-		if (SecurityToken::IsKeyfilePathValid (Path))
-		{
-			// Apply keyfile generated by a security token
-			vector <byte> keyfileData;
-			SecurityToken::GetKeyfileData (SecurityTokenKeyfile (wstring (Path)), keyfileData);
+        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 (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 (++totalLength >= MaxProcessedLength)
-					break;
-			}
+                if (poolPos >= pool.Size())
+                    poolPos = 0;
 
-			burn (&keyfileData.front(), keyfileData.size());
-			goto done;
-		}
+                if (++totalLength >= MaxProcessedLength)
+                    break;
+            }
 
-		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]);
+            burn(&keyfileData.front(), keyfileData.size());
+            goto  done;
+        }
 
-				pool[poolPos++] += (byte) (crc >> 24);
-				pool[poolPos++] += (byte) (crc >> 16);
-				pool[poolPos++] += (byte) (crc >> 8);
-				pool[poolPos++] += (byte) crc;
+        file.Open (Path, File::OpenRead, File::ShareRead);
 
-				if (poolPos >= pool.Size())
-					poolPos = 0;
+        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 >= 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)
+	shared_ptr <VolumePassword> Keyfile::ApplyListToPassword (shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> password, bool EMVOption)
 	{
 		if (!password)
 			password.reset (new VolumePassword);
@@ -143,7 +139,7 @@ done:
 			// Apply all keyfiles
 			foreach_ref (const Keyfile &k, keyfilesExp)
 			{
-				k.Apply (keyfilePool);
+				k.Apply (keyfilePool, EMVOption);
 			}
 
 			newPassword->Set (keyfilePool);