Skip to content

fix(x509): Don't throw when key usage extension is missing in certificate #44

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
Apr 4, 2023
Merged

fix(x509): Don't throw when key usage extension is missing in certificate #44

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: 2 additions & 6 deletions src/electronic-ids/x509.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ inline CertificateType certificateType(const pcsc_cpp::byte_vector& cert)
}
auto keyUsage = SCOPE_GUARD(ASN1_BIT_STRING, extension(x509.get(), NID_key_usage));
if (!keyUsage) {
THROW(SmartCardChangeRequiredError, "Failed to find key usage extension from certificate");
return electronic_id::CertificateType::NONE;
}

static const int KEY_USAGE_NON_REPUDIATION = 1;
Expand All @@ -47,11 +47,7 @@ inline CertificateType certificateType(const pcsc_cpp::byte_vector& cert)
if (ASN1_BIT_STRING_get_bit(keyUsage.get(), KEY_USAGE_DIGITAL_SIGNATURE)) {
auto extKeyUsage =
SCOPE_GUARD(EXTENDED_KEY_USAGE, extension(x509.get(), NID_ext_key_usage));
if (!extKeyUsage) {
THROW(SmartCardChangeRequiredError,
"Failed to find extended key usage extension from certificate");
}
if (hasClientAuthExtendedKeyUsage(extKeyUsage.get())) {
if (extKeyUsage && hasClientAuthExtendedKeyUsage(extKeyUsage.get())) {
return electronic_id::CertificateType::AUTHENTICATION;
}
}
Expand Down