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 2021/01/20 18:39:10 UTC
svn commit: r1885723 - in
/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature:
TSAClient.java ValidationTimeStamp.java
Author: tilman
Date: Wed Jan 20 18:39:09 2021
New Revision: 1885723
URL: http://svn.apache.org/viewvc?rev=1885723&view=rev
Log:
PDFBOX-5070: refactor to keep TimeStampToken a bit longer
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java?rev=1885723&r1=1885722&r2=1885723&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java Wed Jan 20 18:39:09 2021
@@ -72,11 +72,11 @@ public class TSAClient
/**
*
* @param content
- * @return the encoded time stamp token
+ * @return the time stamp token
* @throws IOException if there was an error with the connection or data from the TSA server,
* or if the time stamp response could not be validated
*/
- public byte[] getTimeStampToken(byte[] content) throws IOException
+ public TimeStampToken getTimeStampToken(byte[] content) throws IOException
{
digest.reset();
byte[] hash = digest.digest(content);
@@ -104,9 +104,9 @@ public class TSAClient
{
throw new IOException(e);
}
-
- TimeStampToken token = response.getTimeStampToken();
- if (token == null)
+
+ TimeStampToken timeStampToken = response.getTimeStampToken();
+ if (timeStampToken == null)
{
// https://www.ietf.org/rfc/rfc3161.html#section-2.4.2
throw new IOException("Response from " + url +
@@ -114,7 +114,7 @@ public class TSAClient
" (" + response.getStatusString() + ")");
}
- return token.getEncoded();
+ return timeStampToken;
}
// gets response data for the given encoded TimeStampRequest data
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java?rev=1885723&r1=1885722&r2=1885723&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java Wed Jan 20 18:39:09 2021
@@ -39,6 +39,7 @@ import org.bouncycastle.asn1.pkcs.PKCSOb
import org.bouncycastle.cms.CMSSignedData;
import org.bouncycastle.cms.SignerInformation;
import org.bouncycastle.cms.SignerInformationStore;
+import org.bouncycastle.tsp.TimeStampToken;
/**
* This class wraps the TSAClient and the work that has to be done with it. Like Adding Signed
@@ -74,7 +75,8 @@ public class ValidationTimeStamp
*/
public byte[] getTimeStampToken(InputStream content) throws IOException
{
- return tsaClient.getTimeStampToken(IOUtils.toByteArray(content));
+ TimeStampToken timeStampToken = tsaClient.getTimeStampToken(IOUtils.toByteArray(content));
+ return timeStampToken.getEncoded();
}
/**
@@ -119,7 +121,8 @@ public class ValidationTimeStamp
vector = unsignedAttributes.toASN1EncodableVector();
}
- byte[] token = tsaClient.getTimeStampToken(signer.getSignature());
+ TimeStampToken timeStampToken = tsaClient.getTimeStampToken(signer.getSignature());
+ byte[] token = timeStampToken.getEncoded();
ASN1ObjectIdentifier oid = PKCSObjectIdentifiers.id_aa_signatureTimeStampToken;
ASN1Encodable signatureTimeStamp = new Attribute(oid,
new DERSet(ASN1Primitive.fromByteArray(token)));