mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-10-06 00:56:35 -05:00
Add EMV functionality (#1080)
* 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>
This commit is contained in:
65 files changed
+2721
-612
No files matched your search
@@ -0,0 +1,121 @@
|
||||
#include "EMVToken.h"
|
||||
|
||||
#include "Platform/Finally.h"
|
||||
#include "Platform/ForEach.h"
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
|
||||
|
||||
|
||||
#if !defined(TC_WINDOWS) || defined(TC_PROTOTYPE)
|
||||
#include "Platform/SerializerFactory.h"
|
||||
#include "Platform/StringConverter.h"
|
||||
#include "Platform/SystemException.h"
|
||||
#else
|
||||
#include "Dictionary.h"
|
||||
#include "Language.h"
|
||||
#endif
|
||||
|
||||
|
||||
using namespace std;
|
||||
|
||||
namespace VeraCrypt
|
||||
{
|
||||
|
||||
IccDataExtractor EMVToken::extractor;
|
||||
|
||||
EMVTokenInfo::~EMVTokenInfo()
|
||||
{
|
||||
burn(&Label,Label.size());
|
||||
}
|
||||
|
||||
EMVTokenKeyfile::EMVTokenKeyfile(const TokenKeyfilePath& path)
|
||||
{
|
||||
Id = EMV_CARDS_LABEL;
|
||||
Token = shared_ptr<EMVTokenInfo>(new EMVTokenInfo());
|
||||
wstring pathStr = path;
|
||||
unsigned long slotId;
|
||||
|
||||
if (swscanf(pathStr.c_str(), TC_EMV_TOKEN_KEYFILE_URL_PREFIX TC_EMV_TOKEN_KEYFILE_URL_SLOT L"/%lu", &slotId) != 1)
|
||||
throw InvalidEMVPath();
|
||||
|
||||
Token->SlotId = slotId;
|
||||
}
|
||||
|
||||
EMVTokenKeyfile::operator TokenKeyfilePath () const
|
||||
{
|
||||
wstringstream path;
|
||||
path << TC_EMV_TOKEN_KEYFILE_URL_PREFIX TC_EMV_TOKEN_KEYFILE_URL_SLOT L"/" << Token->SlotId;
|
||||
return path.str();
|
||||
}
|
||||
|
||||
void EMVTokenKeyfile::GetKeyfileData(vector <byte>& keyfileData) const
|
||||
{
|
||||
#ifdef TC_WINDOWS
|
||||
EMVToken::extractor.InitLibrary();
|
||||
#endif
|
||||
|
||||
EMVToken::extractor.GetReaders();
|
||||
EMVToken::extractor.GettingAllCerts(Token->SlotId, keyfileData);
|
||||
}
|
||||
|
||||
bool EMVToken::IsKeyfilePathValid(const wstring& emvTokenKeyfilePath)
|
||||
{
|
||||
return emvTokenKeyfilePath.find(TC_EMV_TOKEN_KEYFILE_URL_PREFIX) == 0;
|
||||
}
|
||||
|
||||
vector<EMVTokenKeyfile> EMVToken::GetAvailableKeyfiles(unsigned long int* slotIdFilter, const wstring keyfileIdFilter) {
|
||||
#ifdef TC_WINDOWS
|
||||
EMVToken::extractor.InitLibrary();
|
||||
#endif
|
||||
|
||||
vector <EMVTokenKeyfile> keyfiles;
|
||||
unsigned long int nb = 0;
|
||||
|
||||
nb = EMVToken::extractor.GetReaders();
|
||||
|
||||
|
||||
for(unsigned long int slotId = 0; slotId<nb; slotId++)
|
||||
{
|
||||
EMVTokenInfo token;
|
||||
|
||||
if (slotIdFilter && *slotIdFilter != slotId)
|
||||
continue;
|
||||
|
||||
try{
|
||||
token = GetTokenInfo(slotId);
|
||||
} catch(EMVUnknownCardType) {
|
||||
continue;
|
||||
}catch(PCSCException){
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
EMVTokenKeyfile keyfile;
|
||||
keyfile.Token->SlotId = slotId;
|
||||
keyfile.Token = shared_ptr<TokenInfo>(new EMVTokenInfo(token));
|
||||
|
||||
keyfiles.push_back(keyfile);
|
||||
|
||||
if (!keyfileIdFilter.empty())
|
||||
break;
|
||||
}
|
||||
|
||||
return keyfiles;
|
||||
|
||||
}
|
||||
|
||||
|
||||
EMVTokenInfo EMVToken::GetTokenInfo(unsigned long int slotId) {
|
||||
EMVTokenInfo token;
|
||||
token.SlotId = slotId;
|
||||
//card numbers extraction
|
||||
std::string pan;
|
||||
EMVToken::extractor.GettingPAN(slotId, pan);
|
||||
token.Label = L"EMV card **** ";
|
||||
token.Label += wstring (pan.begin(), pan.end());
|
||||
burn(&pan[0],pan.size());
|
||||
return token;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user