mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2025-11-11 11:08:02 -06: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:
mmauv
GitHub
179
src/Common/TLVParser.cpp
Normal file
179
src/Common/TLVParser.cpp
Normal file
@@ -0,0 +1,179 @@
|
||||
#include "TLVParser.h"
|
||||
#include <string.h>
|
||||
|
||||
using namespace std;
|
||||
|
||||
/* TLV node structure creation */
|
||||
shared_ptr<TLVNode> TLVParser::TLV_CreateNode()
|
||||
{
|
||||
shared_ptr<TLVNode> node= shared_ptr<TLVNode>(new TLVNode);
|
||||
memset(node.get(),0,sizeof(*node));
|
||||
return node;
|
||||
}
|
||||
|
||||
/* Check if the bit is correct */
|
||||
uint16_t TLVParser::CheckBit(unsigned char value, int bit){
|
||||
unsigned char bitvalue[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
|
||||
|
||||
if((bit >= 1)&&(bit <= 8)){
|
||||
if(value & bitvalue[bit-1]) {
|
||||
return (1);
|
||||
}
|
||||
else {
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
else{
|
||||
throw TLVException("FILE:"+string(__FILE__)+"LINE: "+to_string(static_cast<long long>((__LINE__)))+" fonction parameter incorrect! bit=["+to_string(static_cast<long long>(bit)));
|
||||
return(2);
|
||||
}
|
||||
}
|
||||
|
||||
/* Parsing one TLV node */
|
||||
shared_ptr<TLVNode> TLVParser::TLV_Parse_One(unsigned char* buf,int size){
|
||||
int index = 0;
|
||||
int i;
|
||||
unsigned char tag1,tag2,tagsize;
|
||||
unsigned char len,lensize;
|
||||
unsigned char* value;
|
||||
shared_ptr<TLVNode> node = TLV_CreateNode();
|
||||
|
||||
tag1 = tag2 = 0;
|
||||
tagsize = 1;
|
||||
tag1 = buf[index++];
|
||||
if((tag1 & 0x1f) == 0x1f){
|
||||
tagsize++;
|
||||
tag2 = buf[index++];
|
||||
//tag2 b8 must be 0!
|
||||
}
|
||||
if(tagsize == 1) {
|
||||
node->Tag = tag1;
|
||||
}
|
||||
else {
|
||||
node->Tag = (tag1 << 8) + tag2;
|
||||
}
|
||||
node->TagSize = tagsize;
|
||||
|
||||
//SubFlag
|
||||
node->SubFlag = CheckBit(tag1,6);
|
||||
|
||||
//L zone
|
||||
len = 0;
|
||||
lensize = 1;
|
||||
len = buf[index++];
|
||||
if(CheckBit(len,8) == 0){
|
||||
node->Length = len;
|
||||
}
|
||||
else{
|
||||
lensize = len & 0x7f;
|
||||
len = 0;
|
||||
for(i=0;i<lensize;i++){
|
||||
len += (uint16_t)buf[index++] << (i*8);
|
||||
}
|
||||
lensize++;
|
||||
}
|
||||
node->Length = len;
|
||||
node->LengthSize = lensize;
|
||||
|
||||
//V zone
|
||||
value = new unsigned char[len];
|
||||
std::copy(buf+index,buf+index+len,value);
|
||||
node->Value = value;
|
||||
index += len;
|
||||
|
||||
if(index < size){
|
||||
node->MoreFlag = 1;
|
||||
}
|
||||
else if(index == size){
|
||||
node->MoreFlag = 0;
|
||||
}
|
||||
else{
|
||||
throw TLVException("Parse Error! index="+to_string(static_cast<long long>(index))+"size="+to_string(static_cast<long long>(size)));
|
||||
}
|
||||
|
||||
return node;
|
||||
}
|
||||
|
||||
/* Parsing all sub-nodes (in width not in depth) of a given parent node */
|
||||
int TLVParser::TLV_Parse_SubNodes(shared_ptr<TLVNode> parent){
|
||||
int sublen = 0;
|
||||
int i;
|
||||
|
||||
//No sub-nodes
|
||||
if(parent->SubFlag == 0)
|
||||
return 0;
|
||||
|
||||
for(i=0;i<parent->SubCount;i++)
|
||||
{
|
||||
sublen += (parent->Sub[i]->TagSize + parent->Sub[i]->Length + parent->Sub[i]->LengthSize);
|
||||
}
|
||||
|
||||
if(sublen < parent->Length)
|
||||
{
|
||||
shared_ptr<TLVNode> subnode = TLV_Parse_One(parent->Value+sublen,parent->Length-sublen);
|
||||
parent->Sub[parent->SubCount++] = subnode;
|
||||
return subnode->MoreFlag;
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* Recursive function to parse all nodes starting from a root parent node */
|
||||
void TLVParser::TLV_Parse_Sub(shared_ptr<TLVNode> parent)
|
||||
{
|
||||
int i;
|
||||
if(parent->SubFlag != 0)
|
||||
{
|
||||
//Parse all sub nodes.
|
||||
while(TLV_Parse_SubNodes(parent) != 0);
|
||||
|
||||
for(i=0;i<parent->SubCount;i++)
|
||||
{
|
||||
if(parent->Sub[i]->SubFlag != 0)
|
||||
{
|
||||
TLV_Parse_Sub(parent->Sub[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
/* Parsing TLV from a buffer and constructing TLV structure */
|
||||
shared_ptr<TLVNode> TLVParser::TLV_Parse(unsigned char* buf,int size)
|
||||
{
|
||||
shared_ptr<TLVNode> node = TLV_Parse_One(buf,size);
|
||||
TLV_Parse_Sub(node);
|
||||
|
||||
return node;
|
||||
}
|
||||
|
||||
/* Finding a TLV node with a particular tag */
|
||||
shared_ptr<TLVNode> TLVParser::TLV_Find(shared_ptr<TLVNode> node,uint16_t tag){
|
||||
int i;
|
||||
shared_ptr<TLVNode> tmpnode;
|
||||
if(node->Tag == tag)
|
||||
{
|
||||
return node;
|
||||
}
|
||||
for(i=0;i<node->SubCount;i++)
|
||||
{
|
||||
tmpnode = NULL;
|
||||
tmpnode = TLV_Find(node->Sub[i],tag);
|
||||
if(tmpnode != NULL){
|
||||
return tmpnode;
|
||||
}
|
||||
}
|
||||
if(node->Next)
|
||||
{
|
||||
tmpnode = NULL;
|
||||
tmpnode = TLV_Find(node->Next,tag);
|
||||
if(tmpnode != NULL){
|
||||
return tmpnode;
|
||||
}
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user