Skip to content

Avoid reallocation in PIN padding #100

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

Merged
mrts merged 1 commit into from
Jan 14, 2025
Merged

Avoid reallocation in PIN padding #100

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
8 changes: 7 additions & 1 deletion src/electronic-ids/pcsc/pcsc-common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,13 @@ inline pcsc_cpp::byte_vector getCertificate(pcsc_cpp::SmartCard& card,
PCSC_CPP_CONSTEXPR_VECTOR inline pcsc_cpp::byte_vector
addPaddingToPin(pcsc_cpp::byte_vector&& pin, size_t paddingLength, pcsc_cpp::byte_type paddingChar)
{
pin.resize(std::max(pin.size(), paddingLength), paddingChar);
if (pin.capacity() < paddingLength) {
THROW(ProgrammingError,
"PIN buffer does not have enough capacity to pad without reallocation");
}
if (pin.size() < paddingLength) {
pin.insert(pin.end(), paddingLength - pin.size(), paddingChar);
}
return std::move(pin);
}

Expand Down
20 changes: 20 additions & 0 deletions tests/mock/test-get-certificate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ TEST(electronic_id_test, selectCertificateEstIDEMIA)
const HashAlgorithm hashAlgo = authAlgo.hashAlgorithm();

pcsc_cpp::byte_vector authPin {'1', '2', '3', '4'};
authPin.reserve(12);

const auto hash = calculateDigest(hashAlgo, dataToSign);
const auto authSignature = cardInfo->eid().signWithAuthKey(std::move(authPin), hash);
if (!verify(hashAlgo, certificateAuth, dataToSign, authSignature, false)) {
Expand All @@ -70,6 +72,8 @@ TEST(electronic_id_test, selectCertificateEstIDEMIA)
EXPECT_EQ(signingRetriesLeft.second, 3);

pcsc_cpp::byte_vector signPin {'1', '2', '3', '4', '5'};
signPin.reserve(12);

EXPECT_EQ(cardInfo->eid().isSupportedSigningHashAlgorithm(hashAlgo), true);
const auto signSignature =
cardInfo->eid().signWithSigningKey(std::move(signPin), hash, hashAlgo);
Expand Down Expand Up @@ -102,6 +106,8 @@ TEST(electronic_id_test, selectCertificateFinV3)
const HashAlgorithm hashAlgo = authAlgo.hashAlgorithm();

pcsc_cpp::byte_vector authPin {'1', '2', '3', '4'};
authPin.reserve(12);

const auto hash = calculateDigest(hashAlgo, dataToSign);
const auto authSignature = cardInfo->eid().signWithAuthKey(std::move(authPin), hash);
if (!verify(hashAlgo, certificateAuth, dataToSign, authSignature, true)) {
Expand All @@ -117,6 +123,8 @@ TEST(electronic_id_test, selectCertificateFinV3)
EXPECT_EQ(signingRetriesLeft.second, 5);

pcsc_cpp::byte_vector signPin {'1', '2', '3', '4', '5', '6'};
signPin.reserve(12);

EXPECT_EQ(cardInfo->eid().isSupportedSigningHashAlgorithm(hashAlgo), true);
const auto signSignature =
cardInfo->eid().signWithSigningKey(std::move(signPin), hash, hashAlgo);
Expand Down Expand Up @@ -149,6 +157,8 @@ TEST(electronic_id_test, selectCertificateFinV4)
const HashAlgorithm hashAlgo = authAlgo.hashAlgorithm();

pcsc_cpp::byte_vector authPin {'1', '2', '3', '4'};
authPin.reserve(12);

const auto hash = calculateDigest(hashAlgo, dataToSign);
const auto authSignature = cardInfo->eid().signWithAuthKey(std::move(authPin), hash);
if (!verify(hashAlgo, certificateAuth, dataToSign, authSignature, true)) {
Expand All @@ -164,6 +174,8 @@ TEST(electronic_id_test, selectCertificateFinV4)
EXPECT_EQ(signingRetriesLeft.second, 5);

pcsc_cpp::byte_vector signPin {'1', '2', '3', '4', '5', '6'};
signPin.reserve(12);

EXPECT_EQ(cardInfo->eid().isSupportedSigningHashAlgorithm(hashAlgo), true);
const auto signSignature =
cardInfo->eid().signWithSigningKey(std::move(signPin), hash, hashAlgo);
Expand Down Expand Up @@ -196,6 +208,8 @@ TEST(electronic_id_test, selectCertificateLat_V1)
const HashAlgorithm hashAlgo = authAlgo.hashAlgorithm();

pcsc_cpp::byte_vector authPin {'1', '2', '3', '4'};
authPin.reserve(64);

const auto hash = calculateDigest(hashAlgo, dataToSign);
const auto authSignature = cardInfo->eid().signWithAuthKey(std::move(authPin), hash);
if (!verify(hashAlgo, certificateAuth, dataToSign, authSignature, false)) {
Expand All @@ -211,6 +225,8 @@ TEST(electronic_id_test, selectCertificateLat_V1)
EXPECT_EQ(signingRetriesLeft.second, 3);

pcsc_cpp::byte_vector signPin {'1', '2', '3', '4', '5', '6'};
signPin.reserve(64);

EXPECT_EQ(cardInfo->eid().isSupportedSigningHashAlgorithm(hashAlgo), true);
const auto signSignature =
cardInfo->eid().signWithSigningKey(std::move(signPin), hash, hashAlgo);
Expand Down Expand Up @@ -243,6 +259,8 @@ TEST(electronic_id_test, selectCertificateLatV2)
const HashAlgorithm hashAlgo = authAlgo.hashAlgorithm();

pcsc_cpp::byte_vector authPin {'1', '2', '3', '4'};
authPin.reserve(64);

const auto hash = calculateDigest(hashAlgo, dataToSign);
const auto authSignature = cardInfo->eid().signWithAuthKey(std::move(authPin), hash);
if (!verify(hashAlgo, certificateAuth, dataToSign, authSignature, false)) {
Expand All @@ -258,6 +276,8 @@ TEST(electronic_id_test, selectCertificateLatV2)
EXPECT_EQ(signingRetriesLeft.second, 3);

pcsc_cpp::byte_vector signPin {'1', '2', '3', '4', '5', '6'};
signPin.reserve(64);

EXPECT_EQ(cardInfo->eid().isSupportedSigningHashAlgorithm(hashAlgo), true);
const auto signSignature =
cardInfo->eid().signWithSigningKey(std::move(signPin), hash, hashAlgo);
Expand Down
Loading