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/12/23 20:59:03 UTC
(mina-sshd) branch dev_3.0 updated (274ef5015 -> df5d9cd3c)
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 274ef5015 GH-852: fix wrong import
add 1ef64dcee GH-856: Fix using BC-FIPS
new b8f53b490 Merge branch 'master' into 3.0.0
add 3a272e9de SSHD-1348: SFTP - gracefully handle zero-length SSH_FXP_READs
add bde56696d Update CHANGES.md
new df5d9cd3c Merge branch 'master' into 3.0.0
The 2 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:
sshd-core/pom.xml | 46 ++++++++++++++++++++++
.../org/apache/sshd/sftp/server/FileHandle.java | 15 ++++++-
.../org/apache/sshd/sftp/server/SftpSubsystem.java | 2 +-
.../sshd/sftp/client/SimpleSftpClientTest.java | 22 +++++++++++
4 files changed, 82 insertions(+), 3 deletions(-)
(mina-sshd) 02/02: 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 df5d9cd3c2d214cb91ef71c15c53c8ddf469138e
Merge: b8f53b490 bde56696d
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Tue Dec 23 20:42:08 2025 +0100
Merge branch 'master' into 3.0.0
.../org/apache/sshd/sftp/server/FileHandle.java | 15 +++++++++++++--
.../org/apache/sshd/sftp/server/SftpSubsystem.java | 2 +-
.../sshd/sftp/client/SimpleSftpClientTest.java | 22 ++++++++++++++++++++++
3 files changed, 36 insertions(+), 3 deletions(-)
(mina-sshd) 01/02: 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 b8f53b490e2cf133b65c79c515269c80017d8151
Merge: 274ef5015 1ef64dcee
Author: Thomas Wolf <tw...@apache.org>
AuthorDate: Thu Dec 4 22:26:37 2025 +0100
Merge branch 'master' into 3.0.0
sshd-core/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --cc sshd-core/pom.xml
index 3f3dfa97f,2e8defdd9..5474c0244
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@@ -180,53 -220,10 +180,99 @@@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <reportsDirectory>${project.build.directory}/surefire-reports-nio2</reportsDirectory>
+ <systemPropertyVariables>
+ <org.apache.sshd.security.provider.SunECWrapper.enabled>false</org.apache.sshd.security.provider.SunECWrapper.enabled>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
++ <execution>
++ <id>bcfips</id>
++ <goals>
++ <goal>test</goal>
++ </goals>
++ <configuration>
++ <redirectTestOutputToFile>true</redirectTestOutputToFile>
++ <reportsDirectory>${project.build.directory}/surefire-reports-bcfips</reportsDirectory>
++ <systemPropertyVariables>
++ <org.apache.sshd.security.fipsEnabled>true</org.apache.sshd.security.fipsEnabled>
++ <org.apache.sshd.security.provider.SunECWrapper.enabled>false</org.apache.sshd.security.provider.SunECWrapper.enabled>
++ </systemPropertyVariables>
++ <includes>
++ <include>**/SignatureFactoriesTest.java</include>
++ </includes>
++ <classpathDependencyExcludes>
++ <classpathDependencyExclude>net.i2p.crypto:eddsa</classpathDependencyExclude>
++ <classpathDependencyExclude>org.bouncycastle:bcprov-jdk18on</classpathDependencyExclude>
++ <classpathDependencyExclude>org.bouncycastle:bcpkix-jdk18on</classpathDependencyExclude>
++ <classpathDependencyExclude>org.bouncycastle:bcpg-jdk18on</classpathDependencyExclude>
++ <classpathDependencyExclude>org.bouncycastle:bcutil-jdk18on</classpathDependencyExclude>
++ </classpathDependencyExcludes>
++ <additionalClasspathDependencies>
++ <additionalClasspathDependency>
++ <groupId>org.bouncycastle</groupId>
++ <artifactId>bc-fips</artifactId>
++ <version>2.1.2</version>
++ </additionalClasspathDependency>
++ <additionalClasspathDependency>
++ <groupId>org.bouncycastle</groupId>
++ <artifactId>bcpkix-fips</artifactId>
++ <version>2.1.10</version>
++ </additionalClasspathDependency>
++ <additionalClasspathDependency>
++ <groupId>org.bouncycastle</groupId>
++ <artifactId>bcpg-fips</artifactId>
++ <version>2.1.11</version>
++ </additionalClasspathDependency>
++ <additionalClasspathDependency>
++ <groupId>org.bouncycastle</groupId>
++ <artifactId>bcutil-fips</artifactId>
++ <version>2.1.5</version>
++ </additionalClasspathDependency>
++ </additionalClasspathDependencies>
++ </configuration>
++ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- <reportsDirectory>${project.build.directory}/surefire-reports-nio2</reportsDirectory>
+ <reportsDirectory>${project.build.directory}/surefire-reports-jce</reportsDirectory>
+ <systemPropertyVariables>
+ <!-- Enable using deprecated ssh-rsa signature keys with JSch 0.2.x -->
+ <jsch.server_host_key>ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,rsa-sha2-512,rsa-sha2-256,ssh-rsa</jsch.server_host_key>
+ <org.apache.sshd.security.provider.EdDSA.enabled>false</org.apache.sshd.security.provider.EdDSA.enabled>
+ <org.apache.sshd.security.provider.BC.enabled>false</org.apache.sshd.security.provider.BC.enabled>
+ </systemPropertyVariables>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <!-- These tests fail inexplicably without Bouncycastle -->
+ <exclude>**/*LoadTest.java</exclude>
+ <exclude>**/SinglePublicKeyAuthTest.java</exclude>
+ <exclude>**/ClientTest.java</exclude>
+ </excludes>
</configuration>
+ <executions>
+ <execution>
+ <id>jce</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>