Skip to content

Commit

Permalink
uthenticode: enforce codeSigning EKU on intermediates (#92)
Browse files Browse the repository at this point in the history
Signed-off-by: William Woodruff <[email protected]>
  • Loading branch information
woodruffw authored Dec 27, 2023
1 parent 9ab8f92 commit f6933e6
Showing 1 changed file with 14 additions and 3 deletions.
17 changes: 14 additions & 3 deletions src/uthenticode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,11 @@ bool SignedData::verify_signature() const {
/* NOTE(ww): Authenticode specification, page 13: the signer must have the
* codeSigning EKU, **or** no member of the signer's chain may have it.
*
* The check below is more strict than that: **every** signer must have
* the codeSigning EKU, and we don't check the embedded chain (since
* we can't do full chain verification anyways).
* The check below is more strict than that: **every** signer and embedded
* intermediate cert must have the codeSigning EKU.
*/

/* Check all signing certificates. */
for (auto i = 0; i < sk_X509_num(signers_stack.get()); ++i) {
auto *signer = sk_X509_value(signers_stack.get(), i);

Expand All @@ -236,6 +237,16 @@ bool SignedData::verify_signature() const {
}
}

/* Check all embedded intermediates. */
for (auto i = 0; i < sk_X509_num(certs); ++i) {
auto *cert = sk_X509_value(certs, i);

auto xku_flags = X509_get_extended_key_usage(cert);
if (!(xku_flags & XKU_CODE_SIGN)) {
return false;
}
}

/* NOTE(ww): What happens below is a bit dumb: we convert our SpcIndirectDataContent back
* into DER form so that we can unwrap its ASN.1 sequence and pass the underlying data
* to PKCS7_verify for verification. This displays our intent a little more clearly than
Expand Down

0 comments on commit f6933e6

Please sign in to comment.