Skip to content

Make message decoding more interoperable for signature verification #309

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make message decoding more interoperable for signature verification #309

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
14 changes: 14 additions & 0 deletions src/main/java/org/jscep/message/PkiMessageDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ public PkiMessage<?> decode(final CMSSignedData pkiMessage)
.getCertificate( cert );
verifier = new JcaSimpleSignerInfoVerifierBuilder().build(javaCert.getPublicKey());
}
// ensure that the encoding used of the signed attributes are the one specified in the original message
signerInfo = new SCEPSignerInformation(signerInfo);
if (signerInfo.verify(verifier) == false) {
final String msg = "pkiMessage verification failed.";
LOGGER.warn(msg);
Expand Down Expand Up @@ -286,4 +288,16 @@ private FailInfo toFailInfo(final Attribute attr) {

return FailInfo.valueOf(Integer.valueOf(string.getString()));
}

private static class SCEPSignerInformation extends SignerInformation {

protected SCEPSignerInformation(SignerInformation baseInfo) {
super(baseInfo);
}

public byte[] getEncodedSignedAttributes()
throws IOException {
return signedAttributeSet.getEncoded();
}
}
}