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/EMVToken.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/EMVToken.cpp')
| -rw-r--r-- | src/Common/EMVToken.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Common/EMVToken.cpp b/src/Common/EMVToken.cpp index 0fe3dc1f..8f89cb7e 100644 --- a/src/Common/EMVToken.cpp +++ b/src/Common/EMVToken.cpp @@ -22,7 +22,7 @@ using namespace std; namespace VeraCrypt { - void AppendData(vector<byte>& buffer, const unsigned char* pbData, size_t cbData, size_t from, size_t length, bool bEncodeLength = false) + void AppendData(vector<uint8>& buffer, const unsigned char* pbData, size_t cbData, size_t from, size_t length, bool bEncodeLength = false) { if (cbData > 0 && from <= cbData - 2 && length > 0 && length <= cbData - from) { @@ -74,13 +74,13 @@ namespace VeraCrypt return path.str(); } - void EMVTokenKeyfile::GetKeyfileData(vector <byte>& keyfileData) const + void EMVTokenKeyfile::GetKeyfileData(vector <uint8>& keyfileData) const { map <unsigned long int, shared_ptr<EMVCard>>::iterator emvCardsIt; shared_ptr<EMVCard> card; - vector<byte> iccCert; - vector<byte> issuerCert; - vector<byte> cplcData; + vector<uint8> iccCert; + vector<uint8> issuerCert; + vector<uint8> cplcData; bool addNewCard = true; keyfileData.clear(); |