[Git][java-team/bouncycastle][master] 2 commits: Close #1049356
Markus Koschany (@apo)
gitlab at salsa.debian.org
Thu Nov 30 21:26:34 GMT 2023
Markus Koschany pushed to branch master at Debian Java Maintainers / bouncycastle
Commits:
a7c8c7ae by Markus Koschany at 2023-11-30T14:51:52+01:00
Close #1049356
- - - - -
9c11e855 by Markus Koschany at 2023-11-30T22:20:28+01:00
Remove backward-compatibility.patch.
We should really fix those reverse-dependencies as long as there is enough
time. Compatibility patches can only be a last resort.
- - - - -
3 changed files:
- debian/changelog
- − debian/patches/backward-compatibility.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,7 +1,7 @@
bouncycastle (1.77-1) unstable; urgency=medium
* Team upload.
- * New upstream version 1.77.
+ * New upstream version 1.77. (Closes: #1049356)
- Fix CVE-2023-33201: potential blind LDAP injection attack.
(Closes: #1040050)
- Fix CVE-2023-33202: potential Denial of Service (DoS) issue within
@@ -9,6 +9,8 @@ bouncycastle (1.77-1) unstable; urgency=medium
(Closes: #1056754)
* Update poms to version 1.77.
* Drop bouncycastle-1.72.3.patch. Fixed upstream.
+ * Remove backward-compatibility.patch. It is time to fix those issues
+ properly in our reverse-dependencies.
* Refresh the remaining patches.
-- Markus Koschany <apo at debian.org> Thu, 30 Nov 2023 13:08:45 +0100
=====================================
debian/patches/backward-compatibility.patch deleted
=====================================
@@ -1,295 +0,0 @@
-From: Emmanuel Bourg <ebourg at apache.org>
-Date: Thu, 30 Nov 2023 13:19:24 +0100
-Subject: Restore removed methods and classes to preserve the backward
- compatibility
-
-Forwarded: not-needed
----
- .../java/org/bouncycastle/asn1/ASN1Boolean.java | 10 ++++++
- .../org/bouncycastle/asn1/ASN1OutputStream.java | 2 +-
- .../java/org/bouncycastle/asn1/DERBoolean.java | 22 +++++++++++++
- .../java/org/bouncycastle/asn1/DEREnumerated.java | 37 ++++++++++++++++++++++
- .../java/org/bouncycastle/asn1/DERInteger.java | 30 ++++++++++++++++++
- .../main/java/org/bouncycastle/asn1/DERNull.java | 2 +-
- .../org/bouncycastle/asn1/DERObjectIdentifier.java | 24 ++++++++++++++
- .../org/bouncycastle/asn1/DEROutputStream.java | 4 +--
- .../asn1/x509/AlgorithmIdentifier.java | 6 ++++
- .../java/org/bouncycastle/math/ec/ECPoint.java | 5 +++
- .../x509/CertPathValidatorUtilities.java | 12 +++++++
- .../org/bouncycastle/asn1/cms/ContentInfo.java | 2 +-
- 12 files changed, 151 insertions(+), 5 deletions(-)
- create mode 100644 core/src/main/java/org/bouncycastle/asn1/DERBoolean.java
- create mode 100644 core/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
- create mode 100644 core/src/main/java/org/bouncycastle/asn1/DERInteger.java
- create mode 100644 core/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java
-
-diff --git a/core/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java b/core/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java
-index 2794e17..1950917 100644
---- a/core/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java
-+++ b/core/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java
-@@ -98,6 +98,16 @@ public class ASN1Boolean
- return (ASN1Boolean)TYPE.getContextInstance(taggedObject, explicit);
- }
-
-+ ASN1Boolean(byte[] value)
-+ {
-+ this.value = createPrimitive(value).value;
-+ }
-+
-+ public ASN1Boolean(boolean value)
-+ {
-+ this.value = (value) ? TRUE_VALUE : FALSE_VALUE;
-+ }
-+
- private ASN1Boolean(byte value)
- {
- this.value = value;
-diff --git a/core/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java b/core/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java
-index 3f3dc4b..2a3c348 100644
---- a/core/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java
-+++ b/core/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java
-@@ -31,7 +31,7 @@ public class ASN1OutputStream
-
- private OutputStream os;
-
-- ASN1OutputStream(OutputStream os)
-+ public ASN1OutputStream(OutputStream os)
- {
- this.os = os;
- }
-diff --git a/core/src/main/java/org/bouncycastle/asn1/DERBoolean.java b/core/src/main/java/org/bouncycastle/asn1/DERBoolean.java
-new file mode 100644
-index 0000000..378ea35
---- /dev/null
-+++ b/core/src/main/java/org/bouncycastle/asn1/DERBoolean.java
-@@ -0,0 +1,22 @@
-+package org.bouncycastle.asn1;
-+
-+/**
-+ * @deprecated use ASN1Boolean
-+ */
-+public class DERBoolean
-+ extends ASN1Boolean
-+{
-+ /**
-+ * @deprecated use getInstance(boolean) method.
-+ * @param value
-+ */
-+ public DERBoolean(boolean value)
-+ {
-+ super(value);
-+ }
-+
-+ DERBoolean(byte[] value)
-+ {
-+ super(value);
-+ }
-+}
-diff --git a/core/src/main/java/org/bouncycastle/asn1/DEREnumerated.java b/core/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
-new file mode 100644
-index 0000000..daa8777
---- /dev/null
-+++ b/core/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
-@@ -0,0 +1,37 @@
-+package org.bouncycastle.asn1;
-+
-+import java.math.BigInteger;
-+
-+/**
-+ * @deprecated Use ASN1Enumerated instead of this.
-+ */
-+public class DEREnumerated
-+ extends ASN1Enumerated
-+{
-+ /**
-+ * @param bytes the value of this enumerated as an encoded BigInteger (signed).
-+ * @deprecated use ASN1Enumerated
-+ */
-+ DEREnumerated(byte[] bytes)
-+ {
-+ super(bytes);
-+ }
-+
-+ /**
-+ * @param value the value of this enumerated.
-+ * @deprecated use ASN1Enumerated
-+ */
-+ public DEREnumerated(BigInteger value)
-+ {
-+ super(value);
-+ }
-+
-+ /**
-+ * @param value the value of this enumerated.
-+ * @deprecated use ASN1Enumerated
-+ */
-+ public DEREnumerated(int value)
-+ {
-+ super(value);
-+ }
-+}
-diff --git a/core/src/main/java/org/bouncycastle/asn1/DERInteger.java b/core/src/main/java/org/bouncycastle/asn1/DERInteger.java
-new file mode 100644
-index 0000000..d2e850f
---- /dev/null
-+++ b/core/src/main/java/org/bouncycastle/asn1/DERInteger.java
-@@ -0,0 +1,30 @@
-+package org.bouncycastle.asn1;
-+
-+import java.math.BigInteger;
-+
-+/**
-+ * @deprecated Use ASN1Integer instead of this,
-+ */
-+public class DERInteger
-+ extends ASN1Integer
-+{
-+ /**
-+ * Constructor from a byte array containing a signed representation of the number.
-+ *
-+ * @param bytes a byte array containing the signed number.A copy is made of the byte array.
-+ */
-+ public DERInteger(byte[] bytes)
-+ {
-+ super(bytes, true);
-+ }
-+
-+ public DERInteger(BigInteger value)
-+ {
-+ super(value);
-+ }
-+
-+ public DERInteger(long value)
-+ {
-+ super(value);
-+ }
-+}
-diff --git a/core/src/main/java/org/bouncycastle/asn1/DERNull.java b/core/src/main/java/org/bouncycastle/asn1/DERNull.java
-index 73e0ef0..58b1975 100644
---- a/core/src/main/java/org/bouncycastle/asn1/DERNull.java
-+++ b/core/src/main/java/org/bouncycastle/asn1/DERNull.java
-@@ -14,7 +14,7 @@ public class DERNull
-
- private static final byte[] zeroBytes = new byte[0];
-
-- private DERNull()
-+ public DERNull()
- {
- }
-
-diff --git a/core/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java b/core/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java
-new file mode 100644
-index 0000000..066c544
---- /dev/null
-+++ b/core/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java
-@@ -0,0 +1,24 @@
-+package org.bouncycastle.asn1;
-+
-+/**
-+ *
-+ * @deprecated Use ASN1ObjectIdentifier instead of this,
-+ */
-+public class DERObjectIdentifier
-+ extends ASN1ObjectIdentifier
-+{
-+ public DERObjectIdentifier(String identifier)
-+ {
-+ super(identifier);
-+ }
-+
-+ DERObjectIdentifier(byte[] bytes)
-+ {
-+ super(bytes, true);
-+ }
-+
-+ DERObjectIdentifier(ASN1ObjectIdentifier oid, String branch)
-+ {
-+ super(oid, branch);
-+ }
-+}
-diff --git a/core/src/main/java/org/bouncycastle/asn1/DEROutputStream.java b/core/src/main/java/org/bouncycastle/asn1/DEROutputStream.java
-index eda7eda..596fc86 100644
---- a/core/src/main/java/org/bouncycastle/asn1/DEROutputStream.java
-+++ b/core/src/main/java/org/bouncycastle/asn1/DEROutputStream.java
-@@ -6,10 +6,10 @@ import java.io.OutputStream;
- /**
- * Stream that outputs encoding based on distinguished encoding rules.
- */
--class DEROutputStream
-+public class DEROutputStream
- extends DLOutputStream
- {
-- DEROutputStream(OutputStream os)
-+ public DEROutputStream(OutputStream os)
- {
- super(os);
- }
-diff --git a/core/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java b/core/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
-index 53333d9..503e96f 100644
---- a/core/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
-+++ b/core/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
-@@ -77,6 +77,12 @@ public class AlgorithmIdentifier
- return algorithm;
- }
-
-+ @Deprecated
-+ public ASN1ObjectIdentifier getObjectId()
-+ {
-+ return algorithm;
-+ }
-+
- public ASN1Encodable getParameters()
- {
- return parameters;
-diff --git a/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java b/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java
-index cc4f63a..1e3f513 100644
---- a/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java
-+++ b/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java
-@@ -474,6 +474,11 @@ public abstract class ECPoint
- return sb.toString();
- }
-
-+ public byte[] getEncoded()
-+ {
-+ return getEncoded(false);
-+ }
-+
- /**
- * Get an encoding of the point value, optionally in compressed format.
- *
-diff --git a/prov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java b/prov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java
-index 949b62a..1167530 100644
---- a/prov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java
-+++ b/prov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java
-@@ -123,6 +123,18 @@ class CertPathValidatorUtilities
- return null == validityDate ? currentDate : validityDate;
- }
-
-+ protected static Date getValidDate(PKIXParameters paramsPKIX)
-+ {
-+ Date validDate = paramsPKIX.getDate();
-+
-+ if (validDate == null)
-+ {
-+ validDate = new Date();
-+ }
-+
-+ return validDate;
-+ }
-+
- protected static X500Principal getSubjectPrincipal(X509Certificate cert)
- {
- return cert.getSubjectX500Principal();
-diff --git a/util/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java b/util/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java
-index a728dac..84087e5 100644
---- a/util/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java
-+++ b/util/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java
-@@ -74,7 +74,7 @@ public class ContentInfo
- return getInstance(ASN1Sequence.getInstance(obj, explicit));
- }
-
-- private ContentInfo(
-+ public ContentInfo(
- ASN1Sequence seq)
- {
- if (seq.size() < 1 || seq.size() > 2)
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,2 @@
02_index.patch
-backward-compatibility.patch
exclude-X509LDAPCertStoreTest.patch
View it on GitLab: https://salsa.debian.org/java-team/bouncycastle/-/compare/b282b8bdae9a97d074e4034b52de996556fa3981...9c11e85560b4adfdd9f0fab897c5f8a4f9236590
--
View it on GitLab: https://salsa.debian.org/java-team/bouncycastle/-/compare/b282b8bdae9a97d074e4034b52de996556fa3981...9c11e85560b4adfdd9f0fab897c5f8a4f9236590
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20231130/c3b0859a/attachment.htm>
More information about the pkg-java-commits
mailing list