You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/11/28 07:32:42 UTC
svn commit: r1870531 - in /pdfbox/branches/issue4569/examples/src:
main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
Author: tilman
Date: Thu Nov 28 07:32:42 2019
New Revision: 1870531
URL: http://svn.apache.org/viewvc?rev=1870531&view=rev
Log:
PDFBOX-3017: use certificateHolder BC class where possible
Modified:
pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
pdfbox/branches/issue4569/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
Modified: pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java?rev=1870531&r1=1870530&r2=1870531&view=diff
==============================================================================
--- pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java (original)
+++ pdfbox/branches/issue4569/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java Thu Nov 28 07:32:42 2019
@@ -597,9 +597,9 @@ public final class ShowSignature
@SuppressWarnings("unchecked") // TimeStampToken.getSID() is untyped
Collection<X509CertificateHolder> tstMatches =
timeStampToken.getCertificates().getMatches((Selector<X509CertificateHolder>) timeStampToken.getSID());
- X509CertificateHolder holder = tstMatches.iterator().next();
- X509Certificate tstCert = new JcaX509CertificateConverter().getCertificate(holder);
- SignerInformationVerifier siv = new JcaSimpleSignerInfoVerifierBuilder().setProvider(SecurityProvider.getProvider()).build(tstCert);
+ X509CertificateHolder certificateHolder = tstMatches.iterator().next();
+ SignerInformationVerifier siv =
+ new JcaSimpleSignerInfoVerifierBuilder().setProvider(SecurityProvider.getProvider()).build(certificateHolder);
timeStampToken.validate(siv);
System.out.println("TimeStampToken validated");
}
Modified: pdfbox/branches/issue4569/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java?rev=1870531&r1=1870530&r2=1870531&view=diff
==============================================================================
--- pdfbox/branches/issue4569/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java (original)
+++ pdfbox/branches/issue4569/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java Thu Nov 28 07:32:42 2019
@@ -349,10 +349,9 @@ public class TestCreateSignature
Collection<X509CertificateHolder> matches = certificatesStore
.getMatches((Selector<X509CertificateHolder>) signerInformation.getSID());
X509CertificateHolder certificateHolder = (X509CertificateHolder) matches.iterator().next();
- X509Certificate certFromSignedData = new JcaX509CertificateConverter().getCertificate(certificateHolder);
- Assert.assertEquals(certificate, certFromSignedData);
+ Assert.assertArrayEquals(certificate.getEncoded(), certificateHolder.getEncoded());
// CMSVerifierCertificateNotValidException means that the keystore wasn't valid at signing time
- if (!signerInformation.verify(new JcaSimpleSignerInfoVerifierBuilder().build(certFromSignedData)))
+ if (!signerInformation.verify(new JcaSimpleSignerInfoVerifierBuilder().build(certificateHolder)))
{
Assert.fail("Signature verification failed");
}