[Git][java-team/cryptacular][master] 7 commits: New upstream version 1.2.6
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Mon Jun 24 04:28:16 BST 2024
Tony Mancill pushed to branch master at Debian Java Maintainers / cryptacular
Commits:
79cf11c4 by tony mancill at 2024-06-23T20:16:46-07:00
New upstream version 1.2.6
- - - - -
3ba7ed76 by tony mancill at 2024-06-23T20:16:47-07:00
Update upstream source from tag 'upstream/1.2.6'
Update to upstream version '1.2.6'
with Debian dir 9661e6efab3b99d7fdbbe817ec3eb49eb594288a
- - - - -
0c6e6f20 by tony mancill at 2024-06-23T20:19:07-07:00
Drop BC 1.76 patch (included in upstream 1.26)
- - - - -
1eab6d17 by tony mancill at 2024-06-23T20:20:38-07:00
Update Homepage URL to https
- - - - -
c17ef1ce by tony mancill at 2024-06-23T20:20:49-07:00
Freshen years in debian/copyright
- - - - -
49bd552d by tony mancill at 2024-06-23T20:21:19-07:00
Bump Standards-Version to 4.7.0
- - - - -
5dfec81f by tony mancill at 2024-06-23T20:22:16-07:00
Prepare changelog for upload
- - - - -
8 changed files:
- NOTICE
- debian/changelog
- debian/control
- debian/copyright
- − debian/patches/01_update_to_bouncycastle_1_76.patch
- − debian/patches/series
- pom.xml
- src/main/java/org/cryptacular/asn/OpenSSLPrivateKeyDecoder.java
Changes:
=====================================
NOTICE
=====================================
@@ -1,5 +1,5 @@
Cryptacular Java Library
-Copyright (C) 2003-2022 Virginia Tech.
+Copyright (C) 2003-2023 Virginia Tech.
All rights reserved.
This product includes software developed at
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+cryptacular (1.2.6-1) unstable; urgency=medium
+
+ * Team upload
+ * New upstream version 1.2.6
+ * Drop BouncyCastle 1.76 patch (included in upstream 1.26)
+ * Update Homepage URL to https
+ * Freshen years in debian/copyright
+ * Bump Standards-Version to 4.7.0
+
+ -- tony mancill <tmancill at debian.org> Sun, 23 Jun 2024 20:21:34 -0700
+
cryptacular (1.2.5-2) unstable; urgency=medium
* Team upload
=====================================
debian/control
=====================================
@@ -13,10 +13,10 @@ Build-Depends-Indep:
libmaven-install-plugin-java (>= 3.1.0),
libmaven-javadoc-plugin-java (>= 3.4.1) <!nodoc>,
testng <!nocheck>,
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
Vcs-Git: https://salsa.debian.org/java-team/cryptacular.git
Vcs-Browser: https://salsa.debian.org/java-team/cryptacular
-Homepage: http://www.cryptacular.org
+Homepage: https://www.cryptacular.org
Rules-Requires-Root: no
Description: high level, general purpose Java cryptographic library
General-purpose Java cryptograhic library, which complements the Bouncy
=====================================
debian/copyright
=====================================
@@ -1,13 +1,13 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Cryptacular Library
-Source: http://www.cryptacular.org
+Source: https://www.cryptacular.org
Files: *
-Copyright: 2003-2022 Virginia Tech.
+Copyright: 2003-2023 Virginia Tech.
License: Apache-2.0 OR LGPL-3
Files: debian/*
-Copyright: 2023, Joseph Nahmias <jello at debian.org>
+Copyright: 2023-2024, Joseph Nahmias <jello at debian.org>
License: Apache-2.0
License: Apache-2.0
=====================================
debian/patches/01_update_to_bouncycastle_1_76.patch deleted
=====================================
@@ -1,51 +0,0 @@
-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 deleted
=====================================
@@ -1 +0,0 @@
-01_update_to_bouncycastle_1_76.patch
=====================================
pom.xml
=====================================
@@ -4,7 +4,7 @@
<groupId>org.cryptacular</groupId>
<artifactId>cryptacular</artifactId>
<packaging>jar</packaging>
- <version>1.2.5</version>
+ <version>1.2.6</version>
<name>Cryptacular Library</name>
<description>The spectacular complement to the Bouncy Castle crypto API for Java.</description>
<url>http://www.cryptacular.org</url>
@@ -73,12 +73,13 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.71</version>
+ <version>1.76</version>
</dependency>
+ <!-- Remain on version 7.5 until source moves to JDK 11 -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>7.5</version>
+ <version>7.5.1</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -88,7 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.3.0</version>
<executions>
<execution>
<id>enforce-maven</id>
@@ -108,7 +109,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
<executions>
<execution>
<id>copy-info</id>
@@ -153,17 +154,17 @@
<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>
<artifactId>maven-deploy-plugin</artifactId>
- <version>3.0.0-M2</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -173,7 +174,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>3.11.0</version>
<configuration>
<fork>true</fork>
<debug>true</debug>
@@ -187,7 +188,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.3.0</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
@@ -218,7 +219,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.1.2</version>
<configuration>
<threadCount>10</threadCount>
<properties>
@@ -232,7 +233,7 @@
<plugin>
<groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
- <version>0.15.7</version>
+ <version>0.17.2</version>
<configuration>
<oldVersion>
<dependency>
@@ -268,13 +269,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.3.2</version>
+ <version>3.5.0</version>
<configuration>
<source>8</source>
<links>
<link>http://download.oracle.com/javase/8/docs/api</link>
</links>
- <bottom><![CDATA[<i>Copyright © 2003-2022 Virginia Tech. All Rights Reserved.</i>]]></bottom>
+ <bottom><![CDATA[<i>Copyright © 2003-2023 Virginia Tech. All Rights Reserved.</i>]]></bottom>
</configuration>
<executions>
<execution>
@@ -289,7 +290,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>
@@ -303,7 +304,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.3.0</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -322,7 +323,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.4</version>
+ <version>5.1.9</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -336,7 +337,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.3.0</version>
+ <version>3.6.0</version>
<configuration>
<appendAssemblyId>true</appendAssemblyId>
<attach>false</attach>
@@ -360,7 +361,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>3.0.0-M5</version>
+ <version>3.0.1</version>
<configuration>
<tagNameFormat>v@{project.version}</tagNameFormat>
</configuration>
@@ -381,7 +382,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>
=====================================
src/main/java/org/cryptacular/asn/OpenSSLPrivateKeyDecoder.java
=====================================
@@ -123,10 +123,10 @@ public class OpenSSLPrivateKeyDecoder extends AbstractPrivateKeyDecoder<Asymmetr
{
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()),
View it on GitLab: https://salsa.debian.org/java-team/cryptacular/-/compare/717250ec1f3735c6847aa921ef8f5ea42c44d0e2...5dfec81f3da73980759e9bcc927b3b2d18e6c189
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/java-team/cryptacular/-/compare/717250ec1f3735c6847aa921ef8f5ea42c44d0e2...5dfec81f3da73980759e9bcc927b3b2d18e6c189
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/20240624/4e1d089e/attachment.htm>
More information about the pkg-java-commits
mailing list