diff options
Diffstat (limited to 'src/Common/SCardReader.cpp')
| -rw-r--r-- | src/Common/SCardReader.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Common/SCardReader.cpp b/src/Common/SCardReader.cpp index 3a762415..6c5f654a 100644 --- a/src/Common/SCardReader.cpp +++ b/src/Common/SCardReader.cpp @@ -15,11 +15,11 @@ namespace VeraCrypt m_scardLoader = scardLoader; m_hSCReaderContext = m_scardLoader->GetSCardContext(); } else { - m_scardLoader = NULL; + m_scardLoader.reset(); m_hSCReaderContext = 0; } m_hCard = hCard; m_dwProtocol = dwProtocol; m_pIO_Protocol = pIO_Protocol; @@ -82,11 +82,11 @@ namespace VeraCrypt } void SCardReader::Clear(void) { m_szSCReaderName = L""; - m_scardLoader = NULL; + m_scardLoader.reset(); m_hSCReaderContext = 0; m_hCard = 0; m_dwProtocol = 0; m_pIO_Protocol = NULL; } @@ -115,11 +115,11 @@ namespace VeraCrypt } } return name; } - bool SCardReader::IsCardPresent(vector<byte>& cardAtr) + bool SCardReader::IsCardPresent(vector<uint8>& cardAtr) { LONG lRet = SCARD_S_SUCCESS; SCARD_READERSTATE state; bool bIsCardPresent = false; #ifdef TC_WINDOWS @@ -163,11 +163,11 @@ namespace VeraCrypt return bIsCardPresent; } bool SCardReader::IsCardPresent() { - vector<byte> dummy; + vector<uint8> dummy; return IsCardPresent(dummy); } LONG SCardReader::CardHandleStatus() { @@ -396,12 +396,12 @@ namespace VeraCrypt bool useExtendedAPDU = false; size_t indexOfLe = 0; size_t indexOfLcData = 0; - vector<byte> pbSendBuffer; - vector<byte> pbRecvBuffer; + vector<uint8> pbSendBuffer; + vector<uint8> pbRecvBuffer; DWORD cbSendLength = 0; DWORD cbRecvLength = 0; responseAPDU.clear(); @@ -458,11 +458,11 @@ namespace VeraCrypt { // case 2s // 256 is encoded as 0x00 pbSendBuffer[4] = (BYTE)ne; indexOfLe = 4; - cbSendLength = 4 + 1; // header || Le (1 byte) + cbSendLength = 4 + 1; // header || Le (1 uint8) } else { // case 2e // 65536 is encoded as 0x00 0x00 0x00 @@ -492,11 +492,11 @@ namespace VeraCrypt if (nc <= 255) { // case 3s pbSendBuffer[4] = (BYTE)nc; indexOfLcData = 5; - cbSendLength = 4 + 1 + nc; // header || Lc (1 byte) || Data + cbSendLength = 4 + 1 + nc; // header || Lc (1 uint8) || Data memcpy(&pbSendBuffer[indexOfLcData], commandAPDU.getData().data(), nc); } else { // case 3e @@ -516,11 +516,11 @@ namespace VeraCrypt if ((nc <= 255) && (ne <= 256)) { // case 4s pbSendBuffer[4] = (BYTE)nc; indexOfLcData = 5; - cbSendLength = 4 + 1 + nc + 1; // header || Lc (1 byte) || Data || Le (1 byte) + cbSendLength = 4 + 1 + nc + 1; // header || Lc (1 uint8) || Data || Le (1 uint8) memcpy(&pbSendBuffer[indexOfLcData], commandAPDU.getData().data(), nc); pbSendBuffer[indexOfLcData + nc] = (ne != 256) ? (BYTE)ne : 0; indexOfLe = indexOfLcData + nc; } else @@ -644,13 +644,13 @@ namespace VeraCrypt if (lRet != SCARD_S_SUCCESS) throw PCSCException(lRet); } - void SCardReader::GetATRFromHandle(vector<byte>& atrValue) + void SCardReader::GetATRFromHandle(vector<uint8>& atrValue) { - vector<byte> pbATR; + vector<uint8> pbATR; DWORD cByte = 0; LONG lRet = 0; atrValue.clear(); |