You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tw...@apache.org on 2025/11/25 11:02:02 UTC
(mina-sshd) branch dev_3.0 updated (9c5b74cc2 -> 274ef5015)
This is an automated email from the ASF dual-hosted git repository.
twolf pushed a change to branch dev_3.0
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
from 9c5b74cc2 Post-release documentation updates
new 1352b75b7 Minor: fix validBefore in ephemeral certificate used in tests
add 621e59f70 Bump com.google.errorprone:error_prone_core from 2.42.0 to 2.43.0 (#846)
add b4f2c4a44 Bump com.github.mwiede:jsch from 2.27.3 to 2.27.4 (#845)
add e82a9d378 Add Maven Wrapper
new a8d7ebe2a Merge branch 'master' into 3.0.0
new 274ef5015 GH-852: fix wrong import
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitattributes | 2 +
.mvn/wrapper/maven-wrapper.properties | 3 +
CHANGES.md | 1 +
assembly/src/main/descriptors/unix-src.xml | 4 +-
assembly/src/main/descriptors/windows-src.xml | 4 +-
mvnw | 295 +++++++++++++++++++++
mvnw.cmd | 189 +++++++++++++
pom.xml | 4 +-
.../security/eddsa/jce/JcePublicKeyFactory.java | 2 +-
.../signature/OpenSshHostCertificateTest.java | 4 +-
10 files changed, 501 insertions(+), 7 deletions(-)
create mode 100644 .mvn/wrapper/maven-wrapper.properties
create mode 100755 mvnw
create mode 100644 mvnw.cmd
(mina-sshd) 03/03: GH-852: fix wrong import
Posted by tw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
twolf pushed a commit to branch dev_3.0
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 274ef5015bd789e42eb58cf0dd3bf76b1c32a9e2
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Tue Nov 25 11:03:44 2025 +0100
GH-852: fix wrong import
Somehow my IDE had automatically imported org.bouncycastle.util.Arrays
instead of java.util.Arrays. Regression tests did not detect this
because the BC dependencies are in fact present during test runs.
The root cause of the problem might be an IDE bug; it is actually set
to exclude org.bouncycastle.util.Arrays from autocompletions or from
suggestions, but somehow it still used it.
---
CHANGES.md | 1 +
.../apache/sshd/common/util/security/eddsa/jce/JcePublicKeyFactory.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 7189eb027..3af9160ea 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -32,6 +32,7 @@ newer Java versions the already built-in cryptographic algorithms for ChaCha20,
## Bug Fixes
+* [GH-852](https://github.com/apache/mina-sshd/issues/852) Fix wrong import
## Major Code Re-factoring
diff --git a/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/jce/JcePublicKeyFactory.java b/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/jce/JcePublicKeyFactory.java
index 214a2d122..c02e9832e 100644
--- a/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/jce/JcePublicKeyFactory.java
+++ b/sshd-common/src/main/java15/org/apache/sshd/common/util/security/eddsa/jce/JcePublicKeyFactory.java
@@ -25,11 +25,11 @@ import java.security.PublicKey;
import java.security.SecureRandom;
import java.security.interfaces.EdECKey;
import java.security.spec.NamedParameterSpec;
+import java.util.Arrays;
import org.apache.sshd.common.util.security.PublicKeyFactory;
import org.apache.sshd.common.util.security.SecurityUtils;
import org.apache.sshd.common.util.security.eddsa.generic.EdDSAUtils;
-import org.bouncycastle.util.Arrays;
public class JcePublicKeyFactory implements PublicKeyFactory {
(mina-sshd) 01/03: Minor: fix validBefore in ephemeral certificate used in tests
Posted by tw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
twolf pushed a commit to branch dev_3.0
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 1352b75b7ecefedee7a2554cc503869e9179a524
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Sun Oct 19 17:34:18 2025 +0200
Minor: fix validBefore in ephemeral certificate used in tests
The test used validBefore(long) with a millisecond value, but it should
have been seconds. Use validBefore(Instant) instead.
---
.../org/apache/sshd/common/signature/OpenSshHostCertificateTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sshd-core/src/test/java/org/apache/sshd/common/signature/OpenSshHostCertificateTest.java b/sshd-core/src/test/java/org/apache/sshd/common/signature/OpenSshHostCertificateTest.java
index 07942f93e..7a2f38681 100644
--- a/sshd-core/src/test/java/org/apache/sshd/common/signature/OpenSshHostCertificateTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/common/signature/OpenSshHostCertificateTest.java
@@ -19,10 +19,10 @@
package org.apache.sshd.common.signature;
import java.security.KeyPair;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
import org.apache.sshd.certificate.OpenSshCertificateBuilder;
@@ -101,7 +101,7 @@ class OpenSshHostCertificateTest extends BaseTestSupport {
.serial(System.currentTimeMillis()) //
.publicKey(hostKeyPair.getPublic()) //
.id("test-cert-" + signatureAlgorithm) //
- .validBefore(System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1)) //
+ .validBefore(Instant.now().plusSeconds(3600)) //
.principals(principals) //
.sign(caKey, signatureAlgorithm);
hostKey = hostKeyPair;
(mina-sshd) 02/03: Merge branch 'master' into 3.0.0
Posted by tw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
twolf pushed a commit to branch dev_3.0
in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit a8d7ebe2a4bc69644db4e0e6a7d72ab9cc9efdbc
Merge: 1352b75b7 e82a9d378
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Tue Nov 25 10:48:39 2025 +0100
Merge branch 'master' into 3.0.0
.gitattributes | 2 +
.mvn/wrapper/maven-wrapper.properties | 3 +
assembly/src/main/descriptors/unix-src.xml | 4 +-
assembly/src/main/descriptors/windows-src.xml | 4 +-
mvnw | 295 ++++++++++++++++++++++++++
mvnw.cmd | 189 +++++++++++++++++
pom.xml | 4 +-
7 files changed, 497 insertions(+), 4 deletions(-)
diff --cc .mvn/wrapper/maven-wrapper.properties
index 000000000,7d4795203..c0bcafe98
mode 000000,100644..100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@@ -1,0 -1,3 +1,3 @@@
+ wrapperVersion=3.3.4
+ distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
++distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
diff --cc pom.xml
index 146ffcea8,1a38b4773..9a48d2c19
--- a/pom.xml
+++ b/pom.xml
@@@ -262,18 -263,18 +262,18 @@@
<showWarnings>true</showWarnings>
</configuration>
<dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId>
- <version>2.15.0</version>
- </dependency>
- <!-- override plexus-compiler-javac-errorprone's dependency on Error Prone with the latest version -->
- <dependency>
+ <version>2.15.0</version>
+ </dependency>
+ <!-- override plexus-compiler-javac-errorprone's dependency on Error Prone with the latest version -->
+ <dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
- <version>2.42.0</version>
- <version>2.43.0</version>
++ <version>2.43.0</version>
</dependency>
- </dependencies>
+ </dependencies>
</plugin>
</plugins>
</build>