diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2023-10-01 11:06:46 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2023-10-01 11:06:46 +0200 |
| commit | 19fa1f86843230439f3032092d65bbb0f07a399e (patch) | |
| tree | 3bcaab636ed06cd11dbae07d250444639deb389c /src/Common | |
| parent | da49ebb927cc15e5d77574b608b3a59b05cebc56 (diff) | |
| download | VeraCrypt-19fa1f86843230439f3032092d65bbb0f07a399e.tar.gz VeraCrypt-19fa1f86843230439f3032092d65bbb0f07a399e.zip | |
Linux: use "-std=c++11" for gcc 4.8 and adapt code to old compilers
Diffstat (limited to 'src/Common')
| -rw-r--r-- | src/Common/EMVCard.cpp | 6 | ||||
| -rw-r--r-- | src/Common/Token.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Common/EMVCard.cpp b/src/Common/EMVCard.cpp index 172a9628..5f694240 100644 --- a/src/Common/EMVCard.cpp +++ b/src/Common/EMVCard.cpp @@ -43,9 +43,9 @@ namespace VeraCrypt map<EMVCardType, vector<byte>> InitializeSupportedAIDs() { map<EMVCardType, vector<byte>> supportedAIDs; - supportedAIDs.insert(std::make_pair(EMVCardType::AMEX, vector<byte>(EMVCard::AMEX_AID, EMVCard::AMEX_AID + (std::end(EMVCard::AMEX_AID) - std::begin(EMVCard::AMEX_AID))))); - supportedAIDs.insert(std::make_pair(EMVCardType::MASTERCARD, vector<byte>(EMVCard::MASTERCARD_AID, EMVCard::MASTERCARD_AID + (std::end(EMVCard::MASTERCARD_AID) - std::begin(EMVCard::MASTERCARD_AID))))); - supportedAIDs.insert(std::make_pair(EMVCardType::VISA, vector<byte>(EMVCard::VISA_AID, EMVCard::VISA_AID + (std::end(EMVCard::VISA_AID) - std::begin(EMVCard::VISA_AID))))); + supportedAIDs.insert(std::make_pair(EMVCardType::AMEX, vector<byte>(EMVCard::AMEX_AID, EMVCard::AMEX_AID + sizeof(EMVCard::AMEX_AID)))); + supportedAIDs.insert(std::make_pair(EMVCardType::MASTERCARD, vector<byte>(EMVCard::MASTERCARD_AID, EMVCard::MASTERCARD_AID + sizeof(EMVCard::MASTERCARD_AID)))); + supportedAIDs.insert(std::make_pair(EMVCardType::VISA, vector<byte>(EMVCard::VISA_AID, EMVCard::VISA_AID + sizeof(EMVCard::VISA_AID)))); return supportedAIDs; } diff --git a/src/Common/Token.h b/src/Common/Token.h index c1dd8ac4..754e2830 100644 --- a/src/Common/Token.h +++ b/src/Common/Token.h @@ -50,9 +50,9 @@ namespace VeraCrypt class Token { public: - static vector<shared_ptr<TokenKeyfile>> GetAvailableKeyfiles(bool isEMVSupportEnabled); + static vector< shared_ptr<TokenKeyfile> > GetAvailableKeyfiles(bool isEMVSupportEnabled); static bool IsKeyfilePathValid(const wstring& tokenKeyfilePath, bool isEMVSupportEnabled); - static list <shared_ptr<TokenInfo>> GetAvailableTokens(); + static list < shared_ptr<TokenInfo> > GetAvailableTokens(); static shared_ptr<TokenKeyfile> getTokenKeyfile(const TokenKeyfilePath& path); }; }; |