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/09/23 17:14:44 UTC
svn commit: r1867383 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
Author: tilman
Date: Mon Sep 23 17:14:44 2019
New Revision: 1867383
URL: http://svn.apache.org/viewvc?rev=1867383&view=rev
Log:
PDFBOX-3017: replace deprecated DEROutputStream
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java?rev=1867383&r1=1867382&r2=1867383&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java Mon Sep 23 17:14:44 2019
@@ -44,12 +44,12 @@ import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.pdmodel.PDDocument;
+import org.bouncycastle.asn1.ASN1Encoding;
import org.bouncycastle.asn1.ASN1InputStream;
import org.bouncycastle.asn1.ASN1ObjectIdentifier;
import org.bouncycastle.asn1.ASN1Primitive;
import org.bouncycastle.asn1.ASN1Set;
import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DEROutputStream;
import org.bouncycastle.asn1.DERSet;
import org.bouncycastle.asn1.cms.ContentInfo;
import org.bouncycastle.asn1.cms.EncryptedContentInfo;
@@ -452,17 +452,13 @@ public final class PublicKeySecurityHand
pkcs7input[21] = three;
pkcs7input[22] = two;
pkcs7input[23] = one;
-
+
ASN1Primitive obj = createDERForRecipient(pkcs7input, certificate);
-
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
- DEROutputStream derOS = new DEROutputStream(baos);
-
- derOS.writeObject(obj);
-
+ obj.encodeTo(baos, ASN1Encoding.DER);
+
recipientsField[i] = baos.toByteArray();
-
+
i++;
}
return recipientsField;