diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-06-12 12:30:04 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2024-06-12 12:30:04 +0200 |
| commit | 455a4f2176a5cfbe325e1e40cea20dd3e466b64c (patch) | |
| tree | 7a84d0f768ee375ea9f648bbbdeac7a4906f13fb /src/Common/TLVParser.cpp | |
| parent | bf9f3ec4f0a987ae1591ab5466f6eee599203c85 (diff) | |
| download | VeraCrypt-455a4f2176a5cfbe325e1e40cea20dd3e466b64c.tar.gz VeraCrypt-455a4f2176a5cfbe325e1e40cea20dd3e466b64c.zip | |
Avoid conflict with C++17 features std::byte by using uint8 type instead of byte
Diffstat (limited to 'src/Common/TLVParser.cpp')
| -rw-r--r-- | src/Common/TLVParser.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Common/TLVParser.cpp b/src/Common/TLVParser.cpp index 9a177007..1e51739c 100644 --- a/src/Common/TLVParser.cpp +++ b/src/Common/TLVParser.cpp @@ -13,7 +13,7 @@ namespace VeraCrypt } /* Check if the bit is correct */ - uint16 TLVParser::CheckBit(byte value, int bit) + uint16 TLVParser::CheckBit(uint8 value, int bit) { unsigned char bitvalue[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; @@ -36,13 +36,13 @@ namespace VeraCrypt } /* Parsing one TLV node */ - shared_ptr<TLVNode> TLVParser::TLV_Parse_One(byte* buf, size_t size) + shared_ptr<TLVNode> TLVParser::TLV_Parse_One(uint8* 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>>(); + uint8 tag1, tag2, tagsize; + uint8 len, lensize; + shared_ptr<vector<uint8>> value = make_shared<vector<uint8>>(); shared_ptr<TLVNode> node = TLV_CreateNode(); tag1 = tag2 = 0; @@ -157,7 +157,7 @@ namespace VeraCrypt } /* Parsing TLV from a buffer and constructing TLV structure */ - shared_ptr<TLVNode> TLVParser::TLV_Parse(byte* buf, size_t size) + shared_ptr<TLVNode> TLVParser::TLV_Parse(uint8* buf, size_t size) { shared_ptr<TLVNode> node = TLV_Parse_One(buf, size); TLV_Parse_Sub(node); |