mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-05-16 09:31:31 +00:00
* Add basic strcture needed for EMV implementation * Add demo EMV functionality with C code pasted in a very dirty and unsafe way. NOT FINAL * Refactor IccExtractor Structure * Fix Makefile * fix include file * move global variables from h to c * revert to memcpy * fix icc data recovery functions * Add EMV functionalities on windows * Make EMVToken structures like SecurityToken * Define constants instead of hard coded values * Token structures created with inheritance * refactor TokenKeyfile to use inherit. + polymor. * add Token.h + Token.cpp in modules in VS2010 * Add a comment at each use of SecurityToken class or objects * SecurityTokenKeyfilesDialog preparation * Implemennt GetAvailableTokens in Token class on windows * merge * up (patching for Windows) * foreach Token.cpp corrected * Display EMV keyfiles on first window in graphic interface * Add token to Windows UI * EMVToken selection on OKButton on Linux * Keyfile.cpp optimization * Move getKeyfileData in the token class * EMV::Token GetAvailableKeyfiles() base * Move getKeyfileData in the token class on unix * Remove test comments * Warnings resolved * RemoveeSecurityTokenLibraryNotInitialized exception if at least one emv token is detected * Adding new files * Remove old files and add the new version to the windows project * Change make_shared to shared_ptr constructor * IccExtractor integration working on linux * Throwing card not EMV execption * catch error when not EMV type in EMVToken::GetAvailableKeyfiles * Change types to compile on windows * list all keyfiles, security keyfiles and emv keyfiles in command line * Change type to be coherent and remove old todo comments * Remove todo comments * Change indentation and resolve a bug from previous commit * Use polymorphism for GetKeyfileData and add export option for EMVTokens on Linux * Linux : Allow to export EMV Tokens in command lines, Windows : Disable the delete button when EMV Keyfiles are selected * Remove SlotId from TokenInfo as it is already in Token * Correct errors on Linux * Disable delete option if one EMV Token is selected on Linux * Fix bug enabling delete button if nothing is selected * emv data used as reference then burnt * use of normal files in linux corrected * help updated * help updated for export functionnality * option EMV added to graphic interface but not yet working * Bug fix : Allow to use multiple EMV on windows * EMV Option added to UserPreferences * EMV Option working for Linux * EMV option added to Windows (not working yet) * [NOT TESTED] EMV option for Windows * Working EMV option on Windows * EMV Option for data extraction working for volume creation * EMV Option for data extraction working for Mount * EMV Option for data extraction working for mounting favorites volumes * EMV Option for extraction working for Changing volume password, Set Derivation Key Algorithm and Add or remove keyfile from volume * Windows : re-checking EMV Option when getting data * Removing error catches in the IccDataExtractor classe (It only throws error now). Changing GetPan signature to resemble the other functions signatures more * Changing EMV errors - Only throwing ICCExtractionException from outside of the ICC module. - Catching all TLVExceptions and PCSCExceptions to throw the right ICCExtractionException - Deleting APDU exceptions. * First version of the documentation * Adding function pointers for winscard library (but it crashes VeraCrypt) * Debugging function pointers * The import of the library on windows work as expected now * Reverting EMVToken.cpp changes used to test to library import * Searching for the System32 path instead of hard codding it * Fixing the bug were VeraCrypt crashes if there is no readers when "add Token files" is clicked * Winscard library not initialized in object constructor anymore to delay it after EMVOption check * Remove winscard lib from windows dependencies * Properly displaying errors * Adding a dot in Language.xml * Catching TLVException * Removing unused code * Remove unusefull comments * Trying to fix 0x1f error * Update IccDataExtractor.cpp * Delete History.xml * Fix get data without get pan * Cleanup code * changes for linux compilation but linking not working * error handling for linux * erasing emv data * Burn PAN * Burn PAN from memory * Uncomment selfcheck before merging master * burn corrected * EMV errors handling for Linux * EMV working for Linux CLI * Doc : Winscard Linux package and VeraCrypt versions --------- Co-authored-by: doriandu45 <d45.poubelle@gmail.com> Co-authored-by: red4game <redemgaiming@gmail.com> Co-authored-by: Brice.Namy <brice.namy@insa-rennes.fr> Co-authored-by: vocthor <pieceo108@gmail.com> Co-authored-by: vocthor <67202139+vocthor@users.noreply.github.com> Co-authored-by: Andrei COCAN <andrei.cocan@insa-rennes.fr> Co-authored-by: AndreiCocan <95496161+AndreiCocan@users.noreply.github.com> Co-authored-by: francoisLEROUX <francois3443@gmail.com>
182 lines
5.0 KiB
C++
182 lines
5.0 KiB
C++
/*
|
|
Derived from source code of TrueCrypt 7.1a, which is
|
|
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
|
|
by the TrueCrypt License 3.0.
|
|
|
|
Modifications and additions to the original source code (contained in this file)
|
|
and all other portions of this file are Copyright (c) 2013-2017 IDRIX
|
|
and are governed by the Apache License 2.0 the full text of which is
|
|
contained in the file License.txt included in VeraCrypt binary and source
|
|
code distribution packages.
|
|
*/
|
|
|
|
#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, bool EMVOption) const
|
|
{
|
|
if (Path.IsDirectory())
|
|
throw ParameterIncorrect (SRC_POS);
|
|
|
|
File file;
|
|
|
|
Crc32 crc32;
|
|
size_t poolPos = 0;
|
|
uint64 totalLength = 0;
|
|
uint64 readLength;
|
|
|
|
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 (keyfileData.size() < MinProcessedLength)
|
|
throw InsufficientData(SRC_POS, Path);
|
|
|
|
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;
|
|
|
|
if (poolPos >= pool.Size())
|
|
poolPos = 0;
|
|
|
|
if (++totalLength >= MaxProcessedLength)
|
|
break;
|
|
}
|
|
|
|
|
|
burn(&keyfileData.front(), keyfileData.size());
|
|
goto done;
|
|
}
|
|
|
|
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:
|
|
|
|
if (totalLength < MinProcessedLength)
|
|
throw InsufficientData (SRC_POS, Path);
|
|
}
|
|
|
|
shared_ptr <VolumePassword> Keyfile::ApplyListToPassword (shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> password, bool EMVOption)
|
|
{
|
|
if (!password)
|
|
password.reset (new VolumePassword);
|
|
|
|
if (!keyfiles || keyfiles->size() < 1)
|
|
return password;
|
|
|
|
KeyfileList keyfilesExp;
|
|
HiddenFileWasPresentInKeyfilePath = false;
|
|
|
|
// Enumerate directories
|
|
foreach (shared_ptr <Keyfile> keyfile, *keyfiles)
|
|
{
|
|
if (FilesystemPath (*keyfile).IsDirectory())
|
|
{
|
|
size_t keyfileCount = 0;
|
|
foreach_ref (const FilePath &path, Directory::GetFilePaths (*keyfile))
|
|
{
|
|
#ifdef TC_UNIX
|
|
// Skip hidden files
|
|
if (wstring (path.ToBaseName()).find (L'.') == 0)
|
|
{
|
|
HiddenFileWasPresentInKeyfilePath = true;
|
|
continue;
|
|
}
|
|
#endif
|
|
keyfilesExp.push_back (make_shared <Keyfile> (path));
|
|
++keyfileCount;
|
|
}
|
|
|
|
if (keyfileCount == 0)
|
|
throw KeyfilePathEmpty (SRC_POS, FilesystemPath (*keyfile));
|
|
}
|
|
else
|
|
{
|
|
keyfilesExp.push_back (keyfile);
|
|
}
|
|
}
|
|
|
|
make_shared_auto (VolumePassword, newPassword);
|
|
|
|
if (keyfilesExp.size() < 1)
|
|
{
|
|
newPassword->Set (*password);
|
|
}
|
|
else
|
|
{
|
|
SecureBuffer keyfilePool (password->Size() <= VolumePassword::MaxLegacySize? VolumePassword::MaxLegacySize: VolumePassword::MaxSize);
|
|
|
|
// Pad password with zeros if shorter than max length
|
|
keyfilePool.Zero();
|
|
keyfilePool.CopyFrom (ConstBufferPtr (password->DataPtr(), password->Size()));
|
|
|
|
// Apply all keyfiles
|
|
foreach_ref (const Keyfile &k, keyfilesExp)
|
|
{
|
|
k.Apply (keyfilePool, EMVOption);
|
|
}
|
|
|
|
newPassword->Set (keyfilePool);
|
|
}
|
|
|
|
return newPassword;
|
|
}
|
|
|
|
shared_ptr <KeyfileList> Keyfile::DeserializeList (shared_ptr <Stream> stream, const string &name)
|
|
{
|
|
shared_ptr <KeyfileList> keyfiles;
|
|
Serializer sr (stream);
|
|
|
|
if (!sr.DeserializeBool (name + "Null"))
|
|
{
|
|
keyfiles.reset (new KeyfileList);
|
|
foreach (const wstring &k, sr.DeserializeWStringList (name))
|
|
keyfiles->push_back (make_shared <Keyfile> (k));
|
|
}
|
|
return keyfiles;
|
|
}
|
|
|
|
void Keyfile::SerializeList (shared_ptr <Stream> stream, const string &name, shared_ptr <KeyfileList> keyfiles)
|
|
{
|
|
Serializer sr (stream);
|
|
sr.Serialize (name + "Null", keyfiles == nullptr);
|
|
if (keyfiles)
|
|
{
|
|
list <wstring> sl;
|
|
|
|
foreach_ref (const Keyfile &k, *keyfiles)
|
|
sl.push_back (FilesystemPath (k));
|
|
|
|
sr.Serialize (name, sl);
|
|
}
|
|
}
|
|
|
|
bool Keyfile::HiddenFileWasPresentInKeyfilePath = false;
|
|
}
|