Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add VerifyPinCommandAPDU #84

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add VerifyPinCommandAPDU #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/libpcsc-cpp/include/pcsc-cpp/pcsc-cpp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ struct CommandApdu

constexpr operator const byte_vector&() const { return d; }

virtual ~CommandApdu() = default;

/**
* A helper function to create a SELECT command APDU.
*
Expand Down
27 changes: 22 additions & 5 deletions src/electronic-ids/pcsc/pcsc-common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,38 @@ addPaddingToPin(pcsc_cpp::byte_vector&& pin, size_t paddingLength, pcsc_cpp::byt
return std::move(pin);
}

struct VerifyPinCommandAPDU : public pcsc_cpp::CommandApdu
{
public:
// Make it move-only
VerifyPinCommandAPDU(const VerifyPinCommandAPDU&) = delete;
VerifyPinCommandAPDU& operator=(const VerifyPinCommandAPDU&) = delete;

VerifyPinCommandAPDU(VerifyPinCommandAPDU&&) noexcept = default;
VerifyPinCommandAPDU& operator=(VerifyPinCommandAPDU&&) noexcept = default;

VerifyPinCommandAPDU(pcsc_cpp::byte_type p2, pcsc_cpp::byte_vector&& pin, size_t paddingLength,
pcsc_cpp::byte_type paddingChar) :
CommandApdu(0x00, 0x20, 0x00, p2,
addPaddingToPin(std::move(pin), paddingLength, paddingChar))
{
}

~VerifyPinCommandAPDU() { std::fill(d.begin(), d.end(), 0); }
};

inline void verifyPin(pcsc_cpp::SmartCard& card, pcsc_cpp::byte_type p2,
pcsc_cpp::byte_vector&& pin, uint8_t pinMinLength, size_t paddingLength,
pcsc_cpp::byte_type paddingChar)
{
pcsc_cpp::ResponseApdu response;

if (card.readerHasPinPad()) {
const pcsc_cpp::CommandApdu verifyPin {0x00, 0x20, 0x00, p2,
addPaddingToPin({}, paddingLength, paddingChar)};
VerifyPinCommandAPDU verifyPin {p2, {}, paddingLength, paddingChar};
response = card.transmitCTL(verifyPin, 0, pinMinLength);

} else {
const pcsc_cpp::CommandApdu verifyPin {
0x00, 0x20, 0x00, p2, addPaddingToPin(std::move(pin), paddingLength, paddingChar)};

VerifyPinCommandAPDU verifyPin {p2, std::move(pin), paddingLength, paddingChar};
response = card.transmit(verifyPin);
}

Expand Down
Loading