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/EMVCard.h | |
| 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/EMVCard.h')
| -rw-r--r-- | src/Common/EMVCard.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Common/EMVCard.h b/src/Common/EMVCard.h index 116de705..70ef035f 100644 --- a/src/Common/EMVCard.h +++ b/src/Common/EMVCard.h @@ -29,11 +29,11 @@ namespace VeraCrypt // After the card has been read, and if some or all fields cannot be read, the EMVCard // object will be considered invalid and will not be included in the list of available cards // of EMVToken. - vector<byte> m_aid; - vector<vector<byte>> m_supportedAids; - vector<byte> m_iccCert; - vector<byte> m_issuerCert; - vector<byte> m_cplcData; + vector<uint8> m_aid; + vector<vector<uint8>> m_supportedAids; + vector<uint8> m_iccCert; + vector<uint8> m_issuerCert; + vector<uint8> m_cplcData; wstring m_lastPANDigits; public: @@ -41,10 +41,10 @@ namespace VeraCrypt // Add other AIDS // https://gist.github.com/pvieito/6224eed92c99b069f6401996c548d0e4 // https://ambimat.com/developer-resources/list-of-application-identifiers-aid/ - const static byte AMEX_AID[7]; - const static byte MASTERCARD_AID[7]; - const static byte VISA_AID[7]; - const static map<EMVCardType, vector<byte>> SUPPORTED_AIDS; + const static uint8 AMEX_AID[7]; + const static uint8 MASTERCARD_AID[7]; + const static uint8 VISA_AID[7]; + const static map<EMVCardType, vector<uint8>> SUPPORTED_AIDS; EMVCard(); EMVCard(size_t slotId); @@ -59,9 +59,9 @@ namespace VeraCrypt // Retrieves the card's AID. // It first checks the card against a list of supported AIDs. // If that fails, it tries getting the AID from the card using PSE - vector<byte> GetCardAID(bool forceContactless = false); + vector<uint8> GetCardAID(bool forceContactless = false); - void GetCardContent(vector<byte>& iccCert, vector<byte>& issuerCert, vector<byte>& cplcData); + void GetCardContent(vector<uint8>& iccCert, vector<uint8>& issuerCert, vector<uint8>& cplcData); void GetCardPAN(wstring& lastPANDigits); }; } |