[Git][java-team/cryptacular][master] 3 commits: d/p/01_update_to_bouncycastle_1_76.patch: cherry-pick upstream patch to...

[Tony Mancill (@tmancill)]

Tony Mancill pushed to branch master at Debian Java Maintainers / cryptacular


Commits:
f785b1db by Vladimir Petko at 2024-01-09T12:53:00+13:00
d/p/01_update_to_bouncycastle_1_76.patch: cherry-pick upstream patch to resolve ftbfs with bouncycastle 1.72 (Closes: #1057498).

- - - - -
8d43e973 by Vladimir Petko at 2024-01-09T12:53:34+13:00
changelog

- - - - -
be44621c by Tony Mancill at 2024-01-09T04:03:55+00:00
Merge branch 'master' into 'master'

Resolve ftbfs with bouncycastle 1.72

See merge request java-team/cryptacular!1
- - - - -


3 changed files:

- debian/changelog
- + debian/patches/01_update_to_bouncycastle_1_76.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+cryptacular (1.2.5-2) UNRELEASED; urgency=medium
+
+  * d/p/01_update_to_bouncycastle_1_76.patch: cherry-pick upstream patch
+    to resolve ftbfs with bouncycastle 1.72 (Closes: #1057498).
+
+ -- Vladimir Petko <vladimir.petko at canonical.com>  Tue, 09 Jan 2024 12:53:15 +1300
+
 cryptacular (1.2.5-1) unstable; urgency=medium
 
   * Initial release (Closes: #1032050)


=====================================
debian/patches/01_update_to_bouncycastle_1_76.patch
=====================================
@@ -0,0 +1,51 @@
+Description: update bouncycastle to v1.76
+Author: Daniel Fisher <dfisher at vt.edu>
+Origin: upstream, https://github.com/vt-middleware/cryptacular/commit/831ad458b5c83c6d5f587feea5f09cc50f65a458
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057498
+Forwarded: not-needed
+Applied-Upstream: 831ad458b5c83c6d5f587feea5f09cc50f65a458
+--- a/pom.xml
++++ b/pom.xml
+@@ -153,7 +153,7 @@
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-clean-plugin</artifactId>
+-        <version>3.2.0</version>
++        <version>3.3.1</version>
+       </plugin>
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+@@ -289,7 +289,7 @@
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-source-plugin</artifactId>
+-        <version>3.2.1</version>
++        <version>3.3.0</version>
+         <executions>
+           <execution>
+             <id>source</id>
+@@ -381,7 +381,7 @@
+           <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-gpg-plugin</artifactId>
+-            <version>3.0.1</version>
++            <version>3.1.0</version>
+             <executions>
+               <execution>
+                 <id>sign-artifacts</id>
+--- a/src/main/java/org/cryptacular/asn/OpenSSLPrivateKeyDecoder.java
++++ b/src/main/java/org/cryptacular/asn/OpenSSLPrivateKeyDecoder.java
+@@ -123,10 +123,10 @@
+   {
+     final ASN1TaggedObject asn1Params = ASN1TaggedObject.getInstance(seq.getObjectAt(2));
+     final X9ECParameters params;
+-    if (asn1Params.getObject() instanceof ASN1ObjectIdentifier) {
+-      params = ECUtil.getNamedCurveByOid(ASN1ObjectIdentifier.getInstance(asn1Params.getObject()));
++    if (asn1Params.getBaseObject() instanceof ASN1ObjectIdentifier) {
++      params = ECUtil.getNamedCurveByOid(ASN1ObjectIdentifier.getInstance(asn1Params.getBaseObject()));
+     } else {
+-      params = X9ECParameters.getInstance(asn1Params.getObject());
++      params = X9ECParameters.getInstance(asn1Params.getBaseObject());
+     }
+     return new ECPrivateKeyParameters(
+       new BigInteger(1, ASN1OctetString.getInstance(seq.getObjectAt(1)).getOctets()),


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+01_update_to_bouncycastle_1_76.patch



View it on GitLab: https://salsa.debian.org/java-team/cryptacular/-/compare/b502db6249d0aad632e6ecc435f398474f946f71...be44621cd7a39ef3e5482f5f46614beb29b97f04

-- 
View it on GitLab: https://salsa.debian.org/java-team/cryptacular/-/compare/b502db6249d0aad632e6ecc435f398474f946f71...be44621cd7a39ef3e5482f5f46614beb29b97f04
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/20240109/b2a4686f/attachment.htm>