[libpdfbox-java] 06/07: Refresh bc-1.47.patch.
gregor herrmann
gregoa at debian.org
Mon Jun 23 15:34:17 UTC 2014
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libpdfbox-java.
commit 08ee0fc2d1f7135cd6775d10b9944f95188123dd
Author: gregor herrmann <gregoa at debian.org>
Date: Mon Jun 23 17:23:47 2014 +0200
Refresh bc-1.47.patch.
---
debian/patches/bc-1.47.patch | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/patches/bc-1.47.patch b/debian/patches/bc-1.47.patch
index 1e5fe11..10d6337 100644
--- a/debian/patches/bc-1.47.patch
+++ b/debian/patches/bc-1.47.patch
@@ -4,12 +4,12 @@ Origin: vendor
Bug: https://issues.apache.org/jira/browse/PDFBOX-1587
https://issues.apache.org/jira/browse/PDFBOX-1669
Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-06-02
+Last-Update: 2014-06-23
--- a/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
+++ b/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/PublicKeySecurityHandler.java
-@@ -37,8 +37,8 @@
- import javax.crypto.SecretKey;
+@@ -39,8 +39,8 @@
+ import org.apache.commons.logging.LogFactory;
import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERObject;
@@ -19,7 +19,7 @@ Last-Update: 2013-06-02
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.DEROutputStream;
import org.bouncycastle.asn1.DERSet;
-@@ -309,7 +309,7 @@
+@@ -316,7 +316,7 @@
pkcs7input[22] = two;
pkcs7input[23] = one;
@@ -28,7 +28,7 @@ Last-Update: 2013-06-02
ByteArrayOutputStream baos = new ByteArrayOutputStream();
-@@ -376,7 +376,7 @@
+@@ -383,7 +383,7 @@
}
@@ -37,7 +37,7 @@ Last-Update: 2013-06-02
throws IOException,
GeneralSecurityException
{
-@@ -387,7 +387,7 @@
+@@ -394,7 +394,7 @@
AlgorithmParameters algorithmparameters = algorithmparametergenerator.generateParameters();
ByteArrayInputStream bytearrayinputstream = new ByteArrayInputStream(algorithmparameters.getEncoded("ASN.1"));
ASN1InputStream asn1inputstream = new ASN1InputStream(bytearrayinputstream);
@@ -46,7 +46,7 @@ Last-Update: 2013-06-02
KeyGenerator keygenerator = KeyGenerator.getInstance(s);
keygenerator.init(128);
SecretKey secretkey = keygenerator.generateKey();
-@@ -397,13 +397,13 @@
+@@ -404,13 +404,13 @@
DEROctetString deroctetstring = new DEROctetString(abyte1);
KeyTransRecipientInfo keytransrecipientinfo = computeRecipientInfo(cert, secretkey.getEncoded());
DERSet derset = new DERSet(new RecipientInfo(keytransrecipientinfo));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpdfbox-java.git
More information about the pkg-java-commits
mailing list