Skip to content

If digital signature bit is set but extended key usage bit is missing, assume authentication certificate in certificateType() - for LuxEID PKCS11 module (v2.6.x) #95

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
Dec 16, 2024
Merged

If digital signature bit is set but extended key usage bit is missing, assume authentication certificate in certificateType() - for LuxEID PKCS11 module (v2.6.x) #95

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
10 changes: 7 additions & 3 deletions src/electronic-ids/x509.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,14 @@ inline CertificateType certificateType(const pcsc_cpp::byte_vector& cert)

static const int KEY_USAGE_DIGITAL_SIGNATURE = 0;
if (ASN1_BIT_STRING_get_bit(keyUsage.get(), KEY_USAGE_DIGITAL_SIGNATURE)) {
if (auto extKeyUsage = extension(x509.get(), NID_ext_key_usage, EXTENDED_KEY_USAGE_free);
extKeyUsage && hasClientAuthExtendedKeyUsage(extKeyUsage.get())) {
return CertificateType::AUTHENTICATION;
if (auto extKeyUsage = extension(x509.get(), NID_ext_key_usage, EXTENDED_KEY_USAGE_free)) {
return hasClientAuthExtendedKeyUsage(extKeyUsage.get())
? CertificateType::AUTHENTICATION
: CertificateType::NONE;
}
// Digital Signature extension present, but Extended Key Usage extension not present,
// assume it is an authentication certificate (e.g. Luxembourg eID).
return CertificateType::AUTHENTICATION;
}

return CertificateType::NONE;
Expand Down
2 changes: 2 additions & 0 deletions tests/mock/test-pkcs11-token.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,13 @@ TEST(electronic_id_test, pkcs11TokenHasAuthenticationCert)
PKCS11CardManager::Token token;
token.cert = base64Decode(AUTH_CERT);
EXPECT_TRUE(certificateType(token.cert).isAuthentication());
EXPECT_FALSE(certificateType(token.cert).isSigning());
}

TEST(electronic_id_test, pkcs11TokenHasSigningCert)
{
PKCS11CardManager::Token token;
token.cert = base64Decode(SIGNING_CERT);
EXPECT_FALSE(certificateType(token.cert).isAuthentication());
EXPECT_TRUE(certificateType(token.cert).isSigning());
}
Loading