Skip to content

Add digest OID to PKCS7/SCEP digest failure logs #31232

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
stevendpclark merged 3 commits into from
Jul 9, 2025
Merged

Add digest OID to PKCS7/SCEP digest failure logs #31232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a23451
Add digest OID to PKCS7/SCEP digest failure logs
stevendpclark Jul 9, 2025
b3e21cf
Add cl
stevendpclark Jul 9, 2025
1264715
Fix type in CL header
stevendpclark Jul 9, 2025
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
3 changes: 3 additions & 0 deletions changelog/31232.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
secrets/pki: Add the digest OID when logging SCEP digest mismatch errors.
```
21 changes: 14 additions & 7 deletions helper/pkcs7/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ func verifySignatureAtTime(p7 *PKCS7, signer signerInfo, truststore *x509.CertPo
computed := h.Sum(nil)
if subtle.ConstantTimeCompare(digest, computed) != 1 {
return &MessageDigestMismatchError{
ExpectedDigest: digest,
ActualDigest: computed,
DigestAlgorithm: signer.DigestAlgorithm.Algorithm,
ExpectedDigest: digest,
ActualDigest: computed,
}
}
signedData, err = marshalAttributes(signer.AuthenticatedAttributes)
Expand Down Expand Up @@ -184,8 +185,9 @@ func verifySignature(p7 *PKCS7, signer signerInfo, truststore *x509.CertPool) (e
computed := h.Sum(nil)
if subtle.ConstantTimeCompare(digest, computed) != 1 {
return &MessageDigestMismatchError{
ExpectedDigest: digest,
ActualDigest: computed,
DigestAlgorithm: signer.DigestAlgorithm.Algorithm,
ExpectedDigest: digest,
ActualDigest: computed,
}
}
signedData, err = marshalAttributes(signer.AuthenticatedAttributes)
Expand Down Expand Up @@ -311,12 +313,17 @@ func verifyCertChain(ee *x509.Certificate, certs []*x509.Certificate, truststore
// MessageDigestMismatchError is returned when the signer data digest does not
// match the computed digest for the contained content
type MessageDigestMismatchError struct {
ExpectedDigest []byte
ActualDigest []byte
ExpectedDigest []byte
ActualDigest []byte
DigestAlgorithm asn1.ObjectIdentifier
}

func (err *MessageDigestMismatchError) Error() string {
return fmt.Sprintf("pkcs7: Message digest mismatch\n\tExpected: %X\n\tActual : %X", err.ExpectedDigest, err.ActualDigest)
digestAlgo := "unknown"
if len(err.DigestAlgorithm) > 0 {
digestAlgo = err.DigestAlgorithm.String()
}
return fmt.Sprintf("pkcs7: Message digest mismatch for algo: %s\n\tExpected: %X\n\tActual: %X", digestAlgo, err.ExpectedDigest, err.ActualDigest)
}

func getSignatureAlgorithm(digestEncryption, digest pkix.AlgorithmIdentifier) (x509.SignatureAlgorithm, error) {
Expand Down
Loading