Emmanuel Bourg pushed to branch master at Debian Java Maintainers / bouncycastle
Commits:
13497c1c by Emmanuel Bourg at 2023-01-06T09:45:02+01:00
Applied a PGP fix from the untagged 1.72.3 release (Closes: #1026329)
- - - - -
bc6dce83 by Emmanuel Bourg at 2023-01-06T09:45:09+01:00
Standards-Version updated to 4.6.2
- - - - -
5a650e88 by Emmanuel Bourg at 2023-01-06T09:52:26+01:00
Upload to unstable
- - - - -
4 changed files:
- debian/changelog
- debian/control
- + debian/patches/bouncycastle-1.72.3.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+bouncycastle (1.72-2) unstable; urgency=medium
+
+ * Applied a PGP fix from the untagged 1.72.3 release (Closes: #1026329)
+ * Standards-Version updated to 4.6.2
+
+ -- Emmanuel Bourg <ebo...@apache.org> Fri, 06 Jan 2023 09:45:13 +0100
+
bouncycastle (1.72-1) unstable; urgency=medium
* New upstream release
=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends: ant,
libjakarta-mail-java,
libmail-java,
maven-repo-helper
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
Vcs-Git: https://salsa.debian.org/java-team/bouncycastle.git
Vcs-Browser: https://salsa.debian.org/java-team/bouncycastle
Homepage: https://www.bouncycastle.org
=====================================
debian/patches/bouncycastle-1.72.3.patch
=====================================
@@ -0,0 +1,34 @@
+Description: Fixes a PGP regression
+Origin: upstream,
https://github.com/bcgit/bc-java/commit/04bc5096ab1a3cf38c91952adf634df448609762
+
https://github.com/bcgit/bc-java/commit/1f549b1adeba7fadf2476be97af0b9e45386165c
+Bug-Debian: https://bugs.debian.org/1026329
+--- a/pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedData.java
++++ b/pg/src/main/java/org/bouncycastle/openpgp/PGPEncryptedData.java
+@@ -96,20 +96,23 @@
+ int bytesFromLookahead = Math.min(bytesRead, lookAhead.length);
+ for (int i = 0; i < bytesFromLookahead; i++)
+ {
+- b[i] = (byte)lookAhead[(bufPtr + i) % lookAhead.length];
++ b[off + i] = (byte)lookAhead[(bufPtr + i) % lookAhead.length];
+ }
+
+ // write tail of readBuffer to lookahead
+ int bufferTail = bytesRead - bytesFromLookahead;
+ for (int i = bufferTail; i < bytesRead; i++)
+ {
+- lookAhead[bufPtr] = readBuffer[i];
++ lookAhead[bufPtr] = readBuffer[i] & 0xff; // we're not at end
of file.
+ bufPtr = (bufPtr + 1) % lookAhead.length;
+ }
+
+ // Copy head of readBuffer to output
+- System.arraycopy(readBuffer, 0, b, off + bytesFromLookahead,
bufferTail);
+-
++ if (bufferTail != 0)
++ {
++ System.arraycopy(readBuffer, 0, b, off + bytesFromLookahead,
bufferTail);
++ }
++
+ return bytesRead;
+ }
+
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
02_index.patch
backward-compatibility.patch
+bouncycastle-1.72.3.patch
View it on GitLab:
https://salsa.debian.org/java-team/bouncycastle/-/compare/240a852e19e4762624f2c782c4338bb38fe46816...5a650e88562b6dd444b6267d344100a44fa0e58a
--
View it on GitLab:
https://salsa.debian.org/java-team/bouncycastle/-/compare/240a852e19e4762624f2c782c4338bb38fe46816...5a650e88562b6dd444b6267d344100a44fa0e58a
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
