VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/TLVParser.cpp
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2023-06-29 00:06:20 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2023-06-29 00:06:20 +0200
commit034b64f4153550cbe5849bcbfc27e187377cc512 (patch)
treed831496163c3891031765010bf1934406b0c4a3c /src/Common/TLVParser.cpp
parent502ab9112a7624dbd7c1c90c2e12ed45512b8b3c (diff)
downloadVeraCrypt-034b64f4153550cbe5849bcbfc27e187377cc512.tar.gz
VeraCrypt-034b64f4153550cbe5849bcbfc27e187377cc512.zip
EMV keyfile support: Overall code improvements and bug fixes
Diffstat (limited to 'src/Common/TLVParser.cpp')
-rw-r--r--src/Common/TLVParser.cpp290
1 files changed, 149 insertions, 141 deletions
diff --git a/src/Common/TLVParser.cpp b/src/Common/TLVParser.cpp
index bda9dec0..9a177007 100644
--- a/src/Common/TLVParser.cpp
+++ b/src/Common/TLVParser.cpp
@@ -3,177 +3,185 @@
using namespace std;
-/* TLV node structure creation */
-shared_ptr<TLVNode> TLVParser::TLV_CreateNode()
+namespace VeraCrypt
{
- shared_ptr<TLVNode> node= shared_ptr<TLVNode>(new TLVNode);
- memset(node.get(),0,sizeof(*node));
- return node;
-}
+ /* TLV node structure creation */
+ shared_ptr<TLVNode> TLVParser::TLV_CreateNode()
+ {
+ shared_ptr<TLVNode> node = shared_ptr<TLVNode>(new TLVNode());
+ 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};
+ /* Check if the bit is correct */
+ uint16 TLVParser::CheckBit(byte 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);
+ if ((bit >= 1) && (bit <= 8))
+ {
+ if (value & bitvalue[bit-1])
+ {
+ return (1);
+ }
+ else
+ {
+ return (0);
+ }
}
- 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);
}
}
- 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);
+ /* Parsing one TLV node */
+ shared_ptr<TLVNode> TLVParser::TLV_Parse_One(byte* buf, size_t size)
+ {
+ size_t index = 0;
+ size_t i = 0;
+ byte tag1, tag2, tagsize;
+ byte len, lensize;
+ shared_ptr<vector<byte>> value = make_shared<vector<byte>>();
+ 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;
- //L zone
- len = 0;
- lensize = 1;
- len = buf[index++];
- if(CheckBit(len,8) == 0){
- node->Length = len;
- }
- else{
- lensize = len & 0x7f;
+ //SubFlag
+ node->SubFlag = CheckBit(tag1,6);
+
+ //L zone
len = 0;
- for(i=0;i<lensize;i++){
- len += (uint16_t)buf[index++] << (i*8);
+ lensize = 1;
+ len = buf[index++];
+ if (CheckBit(len,8) == 0)
+ {
+ node->Length = len;
}
- lensize++;
- }
- node->Length = len;
- node->LengthSize = lensize;
+ else
+ {
+ lensize = len & 0x7f;
+ len = 0;
+ for (i = 0; i < lensize; i++)
+ {
+ len += (uint16)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;
+ //V zone
+ value->resize(len);
+ memcpy(value->data(), buf + index, len);
+ 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)));
- }
+ 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;
-}
+ 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;
+ /* Parsing all sub-nodes (in width not in depth) of a given parent node */
+ int TLVParser::TLV_Parse_SubNodes(shared_ptr<TLVNode> parent)
+ {
+ uint16 sublen = 0;
+ size_t i;
- //No sub-nodes
- if(parent->SubFlag == 0)
- return 0;
+ //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);
- }
+ for (i = 0; i < parent->Subs->size(); i++)
+ {
+ sublen += (parent->Subs->at(i)->TagSize + parent->Subs->at(i)->Length + parent->Subs->at(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;
+ if (sublen < parent->Value->size())
+ {
+ shared_ptr<TLVNode> subnode = TLV_Parse_One(parent->Value->data() + sublen, parent->Value->size() - sublen);
+ parent->Subs->push_back(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)
+ /* Recursive function to parse all nodes starting from a root parent node */
+ void TLVParser::TLV_Parse_Sub(shared_ptr<TLVNode> parent)
{
- //Parse all sub nodes.
- while(TLV_Parse_SubNodes(parent) != 0);
-
- for(i=0;i<parent->SubCount;i++)
+ size_t i;
+ if (parent->SubFlag != 0)
{
- if(parent->Sub[i]->SubFlag != 0)
+ // Parse all sub nodes.
+ while (TLV_Parse_SubNodes(parent) != 0);
+
+ for (i = 0; i < parent->Subs->size(); i++)
{
- TLV_Parse_Sub(parent->Sub[i]);
+ if (parent->Subs->at(i)->SubFlag != 0)
+ {
+ TLV_Parse_Sub(parent->Subs->at(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)
+ /* Parsing TLV from a buffer and constructing TLV structure */
+ shared_ptr<TLVNode> TLVParser::TLV_Parse(byte* buf, size_t size)
{
+ shared_ptr<TLVNode> node = TLV_Parse_One(buf, size);
+ TLV_Parse_Sub(node);
+
return node;
}
- for(i=0;i<node->SubCount;i++)
+
+ /* Finding a TLV node with a particular tag */
+ shared_ptr<TLVNode> TLVParser::TLV_Find(shared_ptr<TLVNode> node, uint16 tag)
{
- tmpnode = NULL;
- tmpnode = TLV_Find(node->Sub[i],tag);
- if(tmpnode != NULL){
- return tmpnode;
+ size_t i = 0;
+ shared_ptr<TLVNode> tmpnode = NULL;
+ if (node->Tag == tag)
+ {
+ return node;
}
- }
- if(node->Next)
- {
- tmpnode = NULL;
- tmpnode = TLV_Find(node->Next,tag);
- if(tmpnode != NULL){
- return tmpnode;
+ for (i = 0; i < node->Subs->size(); i++)
+ {
+ tmpnode = TLV_Find(node->Subs->at(i),tag);
+ if (tmpnode != NULL)
+ {
+ return tmpnode;
+ }
}
+ return NULL;
}
-
- return nullptr;
-}
-
+} \ No newline at end of file