[Git][java-team/cryptacular][upstream] New upstream version 1.2.6
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Mon Jun 24 04:28:18 BST 2024
Tony Mancill pushed to branch upstream at Debian Java Maintainers / cryptacular
Commits:
79cf11c4 by tony mancill at 2024-06-23T20:16:46-07:00
New upstream version 1.2.6
- - - - -
3 changed files:
- NOTICE
- 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
=====================================
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/-/commit/79cf11c43869a67da2bb7cd93ea6eadcd3b292f8
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/java-team/cryptacular/-/commit/79cf11c43869a67da2bb7cd93ea6eadcd3b292f8
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/a61dc442/attachment.htm>
More information about the pkg-java-commits
mailing list