Author: tilman
Date: Wed Oct 17 17:21:39 2018
New Revision: 1844136
URL: http://svn.apache.org/viewvc?rev=1844136&view=rev
Log:
PDFBOX-3017: simplify code
Modified:
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
Modified:
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java?rev=1844136&r1=1844135&r2=1844136&view=diff
==============================================================================
---
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
(original)
+++
pdfbox/branches/2.0/examples/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java
Wed Oct 17 17:21:39 2018
@@ -27,12 +27,9 @@ import java.security.UnrecoverableKeyExc
import java.security.cert.Certificate;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
-import java.util.List;
import
org.apache.pdfbox.pdmodel.interactive.digitalsignature.SignatureInterface;
-import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.jcajce.JcaCertStore;
import org.bouncycastle.cms.CMSException;
import org.bouncycastle.cms.CMSSignedData;
@@ -42,7 +39,6 @@ import org.bouncycastle.operator.Content
import org.bouncycastle.operator.OperatorCreationException;
import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.Store;
public abstract class CreateSignatureBase implements SignatureInterface
{
@@ -130,14 +126,11 @@ public abstract class CreateSignatureBas
// cannot be done private (interface)
try
{
- List<Certificate> certList = new ArrayList<Certificate>();
- certList.addAll(Arrays.asList(certificateChain));
- Store certs = new JcaCertStore(certList);
CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
- org.bouncycastle.asn1.x509.Certificate cert =
org.bouncycastle.asn1.x509.Certificate.getInstance(certificateChain[0].getEncoded());
+ X509Certificate cert = (X509Certificate) certificateChain[0];
ContentSigner sha1Signer = new
JcaContentSignerBuilder("SHA256WithRSA").build(privateKey);
- gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new
JcaDigestCalculatorProviderBuilder().build()).build(sha1Signer, new
X509CertificateHolder(cert)));
- gen.addCertificates(certs);
+ gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new
JcaDigestCalculatorProviderBuilder().build()).build(sha1Signer, cert));
+ gen.addCertificates(new
JcaCertStore(Arrays.asList(certificateChain)));
CMSProcessableInputStream msg = new
CMSProcessableInputStream(content);
CMSSignedData signedData = gen.generate(msg, false);
if (tsaUrl != null && tsaUrl.length() > 0)
