Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package apache-sshd for openSUSE:Factory 
checked in at 2022-11-16 15:44:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-sshd (Old)
 and      /work/SRC/openSUSE:Factory/.apache-sshd.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "apache-sshd"

Wed Nov 16 15:44:12 2022 rev:4 rq:1036214 version:2.9.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/apache-sshd/apache-sshd.changes  2021-07-30 
23:22:57.743584621 +0200
+++ /work/SRC/openSUSE:Factory/.apache-sshd.new.1597/apache-sshd.changes        
2022-11-16 15:44:14.640054573 +0100
@@ -1,0 +2,119 @@
+Wed Nov 16 11:36:21 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Upgrade to version 2.9.2 (bsc#1205463, CVE-2022-45047)
+- Changes in version 2.8.0
+  * Bug
+    + Wrong server key algorithm choose
+    + Expiration of OpenSshCertificates needs to compare timestamps
+      as unsigned long
+    + SFTP Get downloads empty file from servers which supports EOF
+      indication after data
+    + skip() doesn't work properly in SftpInputStreamAsync
+    + OpenMode and CopyMode is not honored as expected in
+      version > 4 of SFTP api
+    + SftpTransferTest sometimes hangs (failure during rekeying)
+    + Race condition in KEX
+    + Fix the ciphers supported documentation
+    + Update tarLongFileMode to use POSIX
+    + WinsCP transfer failure to Apache SSHD Server
+    + Pubkey auth: keys from ssh-agent are used even if
+      HostConfigEntry.isIdentitiesOnly() is true
+    + Support RSA SHA2 signatures via SSH agent
+    + NOTICE: wrong copyright year range
+    + Wrong creationTime in writeAttrs for SFTP
+    + sshd-netty logs all traffic on INFO level
+  * New Feature
+    + Add support for chacha20-poly1...@openssh.com
+    + Parsing of ~/.ssh/config Host patterns fails with extra
+      whitespace
+    + Support generating OpenSSH client certificates
+  * Improvement
+    + Add support for curve25519-sha...@libssh.org key exchange
+    + OpenSSH certificates: check certificate type
+    + OpenSSHCertificatesTest: certificates expire in 2030
+    + Display IdleTimeOut in more user-friendly format
+    + sendChunkIfRemoteWindowIsSmallerThanPacketSize flag in
+      ChannelAsyncOutputStream constructor configurable from
+      outside using variable/config file
+    + Intercepting the server exception message from server in SSHD
+      client
+    + Implement RFC 8332 server-sig-algs on the server
+    + Slow performance listing huge number of files on Apache SSHD
+      server
+    + SFTP: too many LSTAT calls
+    + Support key constraints when adding a key to an SSH agent
+    + Add SFTP server side file custom attributes hook
+  * Task
+    + Make sure the project is built using a <release>1.8</release>
+  * Question
+    + UserInteraction Problem
+- Changes of vesion 2.9.0
+  * Bug
+    + Deadlock on disconnection at the end of key-exchange
+    + Remote port forwarding mode does not handle EOF properly
+    + Public key authentication: wrong signature algorithm used
+      (ed25519 key with ssh-rsa signature)
+    + Client fails window adjust above Integer.MAX_VALUE
+    + class loader fails to load
+      org.apache.sshd.common.cipher.BaseGCMCipher
+    + Shell is not getting closed if the command has already closed
+      the OutputStream it is using.
+    + Sometimes async write listener is not called
+    + Unhandled SSH_MSG_CHANNEL_WINDOW_ADJUST leeds to
+      SocketTimeoutException
+    + different host key algorithm used on rekey than used for the
+      initial connection
+    + OpenSSH certificate is not properly encoded when critical
+      options are included
+    + TCP/IP remote port forwarding with wildcard IP addresses
+      doesn't work with OpenSSH
+    + UserAuthPublicKey: uses ssh-rsa signatures for RSA keys from
+      an agent
+  * New Feature
+    + Add support for Argon2 encrypted PUTTY key files
+    + Add support for merged inverted output and error streams of
+      remote process
+  * Improvement
+    + Add support for "lim...@openssh.com" SFTP extension
+    + Support host-based pubkey authentication in the client
+    + Send environment variable and open subsystem at the same time
+      for SSH session
+- Changes of version 2.9.1
+  * Bug
+    + ClientSession.auth().verify() is terminated with timeout
+    + 2.9.0 release broken on Java 8
+    + Infinite loop in
+      org.apache.sshd.sftp.client.impl.SftpInputStreamAsync#doRead
+    + Deadlock during session exit
+    + Race condition is logged in ChannelAsyncOutputStream
+- Changes of version 2.9.2
+  * Bug
+    + SFTP worker threads got stuck while processing PUT methods
+      against one specific SFTP server
+    + Use the maximum packet size of the communication partner
+    + ExplicitPortForwardingTracker does not unbind auto-allocated
+      one
+    + Default SshClient FD leak because Selector not closed
+    + Reading again from exhausted ChannelExec#getInvertedOut()
+      throws IOException instead of returning -1
+    + Keeping error streams and input streams separate after
+      ChannelExec#setRedirectErrorStream(true) is called
+    + Nio2Session.shutdownOutput() should wait for writes in
+      progress
+  * Test
+    + Research intermittent failure in unit tests using various I/O
+      service factories
+- Modified patch:
+  * 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch
+    + rediff to changed context
+- Removed patches:
+  * 0002-Fix-manifest-generation.patch
+    + not needed any more in this version
+  * apache-sshd-2.7.0-java8.patch
+    + not needed since the Java 8 compatibility is handled by the
+      --release option
+- Added patch:
+  * apache-sshd-javadoc.patch
+    + Fix different warnings in javadoc generation
+
+-------------------------------------------------------------------

Old:
----
  0002-Fix-manifest-generation.patch
  apache-sshd-2.7.0-java8.patch
  apache-sshd-2.7.0-src.tar.gz

New:
----
  apache-sshd-2.9.2-src.tar.gz
  apache-sshd-javadoc.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ apache-sshd.spec ++++++
--- /var/tmp/diff_new_pack.cSIuRc/_old  2022-11-16 15:44:15.168057165 +0100
+++ /var/tmp/diff_new_pack.cSIuRc/_new  2022-11-16 15:44:15.172057186 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-sshd
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           apache-sshd
-Version:        2.7.0
+Version:        2.9.2
 Release:        0
 Summary:        Apache SSHD
 # One file has ISC licensing:
@@ -27,14 +27,12 @@
 Source0:        
https://archive.apache.org/dist/mina/sshd/%{version}/apache-sshd-%{version}-src.tar.gz
 # Avoid optional dep on tomcat native APR library
 Patch0:         0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch
-Patch1:         0002-Fix-manifest-generation.patch
-Patch2:         apache-sshd-2.7.0-java8.patch
+Patch1:         apache-sshd-javadoc.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(net.i2p.crypto:eddsa)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-clean-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
@@ -46,6 +44,7 @@
 BuildRequires:  mvn(org.bouncycastle:bcpkix-jdk15on)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires:  mvn(org.slf4j:jcl-over-slf4j)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildArch:      noarch
 
@@ -65,13 +64,12 @@
 # Avoid optional dep on tomcat native APR library
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 rm -rf sshd-core/src/main/java/org/apache/sshd/agent/unix
 
 # Avoid unnecessary dep on spring framework
 %pom_remove_dep :spring-framework-bom
-%pom_remove_dep :testcontainers-bom sshd-sftp
+%pom_remove_dep :testcontainers-bom sshd-sftp sshd-core
 
 # Build the core modules only
 %pom_disable_module assembly
@@ -101,7 +99,11 @@
 
 %build
 # Can't run tests, they require ch.ethz.ganymed:ganymed-ssh2
-%{mvn_build} -f -- -Dworkspace.root.dir=$(pwd) -Dsource=8
+%{mvn_build} -f -- -Dworkspace.root.dir=$(pwd) \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+    -Dmaven.compiler.release=8 \
+%endif
+    -Dsource=8
 
 %install
 %mvn_install

++++++ 0001-Avoid-optional-dependency-on-native-tomcat-APR-libra.patch ++++++
--- /var/tmp/diff_new_pack.cSIuRc/_old  2022-11-16 15:44:15.192057284 +0100
+++ /var/tmp/diff_new_pack.cSIuRc/_new  2022-11-16 15:44:15.196057304 +0100
@@ -14,9 +14,9 @@
 index 867ca88..7c29678 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -406,11 +406,6 @@
+@@ -428,11 +428,6 @@
                  <artifactId>mina-core</artifactId>
-                 <version>2.0.21</version>
+                 <version>2.0.23</version>
              </dependency>
 -            <dependency>
 -                <groupId>tomcat</groupId>

++++++ apache-sshd-2.7.0-src.tar.gz -> apache-sshd-2.9.2-src.tar.gz ++++++
++++ 47132 lines of diff (skipped)

++++++ apache-sshd-javadoc.patch ++++++
--- 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java
      2022-11-16 09:50:02.519293210 +0100
+++ 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/client/auth/password/PasswordIdentityProvider.java
      2022-11-16 10:29:30.819501234 +0100
@@ -36,7 +36,7 @@
 public interface PasswordIdentityProvider {
 
     /**
-     * An &quot;empty&quot implementation of {@link PasswordIdentityProvider} 
that returns an empty group of passwords
+     * An &quot;empty&quot; implementation of {@link PasswordIdentityProvider} 
that returns an empty group of passwords
      */
     PasswordIdentityProvider EMPTY_PASSWORDS_PROVIDER = new 
PasswordIdentityProvider() {
         @Override
--- 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/config/keys/KeyUtils.java
        2022-11-16 09:50:02.523293237 +0100
+++ 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/config/keys/KeyUtils.java
        2022-11-16 10:21:06.704044979 +0100
@@ -754,7 +754,7 @@
      * @param  expected The expected fingerprint if {@code null} or empty then 
returns a failure with the default
      *                  fingerprint.
      * @param  key      the {@link PublicKey} - if {@code null} then returns 
null.
-     * @return          SimpleImmutableEntry<Boolean, String> - key is success 
indicator, value is actual fingerprint,
+     * @return          SimpleImmutableEntry&lt;Boolean, String&gt; - key is 
success indicator, value is actual fingerprint,
      *                  {@code null} if no key.
      * @see             #getDefaultFingerPrintFactory()
      * @see             #checkFingerPrint(String, Factory, PublicKey)
@@ -768,7 +768,7 @@
      *                  fingerprint.
      * @param  f        The {@link Factory} to be used to generate the default 
{@link Digest} for the key
      * @param  key      the {@link PublicKey} - if {@code null} then returns 
null.
-     * @return          SimpleImmutableEntry<Boolean, String> - key is success 
indicator, value is actual fingerprint,
+     * @return          SimpleImmutableEntry&lt;Boolean, String&gt; - key is 
success indicator, value is actual fingerprint,
      *                  {@code null} if no key.
      */
     public static SimpleImmutableEntry<Boolean, String> checkFingerPrint(
@@ -781,7 +781,7 @@
      *                  fingerprint.
      * @param  d        The {@link Digest} to be used to generate the default 
fingerprint for the key
      * @param  key      the {@link PublicKey} - if {@code null} then returns 
null.
-     * @return          SimpleImmutableEntry<Boolean, String> - key is success 
indicator, value is actual fingerprint,
+     * @return          SimpleImmutableEntry&lt;Boolean, String&gt; - key is 
success indicator, value is actual fingerprint,
      *                  {@code null} if no key.
      */
     public static SimpleImmutableEntry<Boolean, String> 
checkFingerPrint(String expected, Digest d, PublicKey key) {
--- 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParser.java
     2022-11-16 09:50:02.523293237 +0100
+++ 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/config/keys/loader/openssh/OpenSSHKeyPairResourceParser.java
     2022-11-16 10:27:11.094543153 +0100
@@ -63,9 +63,7 @@
 import org.apache.sshd.common.util.security.SecurityUtils;
 
 /**
- * Basic support for <A HREF=
- * 
"http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.key?rev=1.1&content-type=text/x-cvsweb-markup";>OpenSSH
- * key file(s)</A>
+ * Basic support for <A 
HREF="http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.key?rev=1.1&amp;content-type=text/x-cvsweb-markup";>OpenSSH
 key file(s)</A>
  *
  * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
  */
--- 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/keys/BufferPublicKeyParser.java
      2022-11-16 09:50:02.531293291 +0100
+++ 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/buffer/keys/BufferPublicKeyParser.java
      2022-11-16 10:07:03.290271908 +0100
@@ -64,13 +64,13 @@
                     SkED25519BufferPublicKeyParser.INSTANCE));
 
     /**
-     * @param  keyType The key type - e.g., &quot;ssh-rsa&quot, 
&quot;ssh-dss&quot;
+     * @param  keyType The key type - e.g., &quot;ssh-rsa&quot;, 
&quot;ssh-dss&quot;
      * @return         {@code true} if this key type is supported by the parser
      */
     boolean isKeyTypeSupported(String keyType);
 
     /**
-     * @param  keyType                  The key type - e.g., 
&quot;ssh-rsa&quot, &quot;ssh-dss&quot;
+     * @param  keyType                  The key type - e.g., 
&quot;ssh-rsa&quot;, &quot;ssh-dss&quot;
      * @param  buffer                   The {@link Buffer} containing the 
encoded raw public key
      * @return                          The decoded {@link PublicKey}
      * @throws GeneralSecurityException If failed to generate the key
--- 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/GenericUtils.java
   2022-11-16 09:50:02.527293266 +0100
+++ 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/GenericUtils.java
   2022-11-16 10:17:14.006452121 +0100
@@ -112,10 +112,11 @@
      * @param  with String to replace with
      * @param  max  maximum number of values to replace, or <code>-1</code> if 
no maximum
      * @return      the text with any replacements processed
-     * @author      Arnout J. Kuiper <a 
href="mailto:ajkui...@wxs.nl";>ajkui...@wxs.nl</a>
-     * @author      Magesh Umasankar
-     * @author      <a href="mailto:br...@callenish.com";>Bruce Atherton</a>
-     * @author      <a href="mailto:levylamb...@tiscali-dsl.de";>Antoine 
Levy-Lambert</a>
+     *
+     * author      Arnout J. Kuiper <a 
href="mailto:ajkui...@wxs.nl";>ajkui...@wxs.nl</a>
+     * author      Magesh Umasankar
+     * author      <a href="mailto:br...@callenish.com";>Bruce Atherton</a>
+     * author      <a href="mailto:levylamb...@tiscali-dsl.de";>Antoine 
Levy-Lambert</a>
      */
     @SuppressWarnings("PMD.AssignmentInOperand")
     public static String replace(String text, String repl, String with, int 
max) {
--- 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/DERWriter.java
       2022-11-16 09:50:02.531293291 +0100
+++ 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/io/der/DERWriter.java
       2022-11-16 10:09:10.435142161 +0100
@@ -76,7 +76,7 @@
     }
 
     /**
-     * The integer is always considered to be positive, so if the first byte 
is < 0, we pad with a zero to make it
+     * The integer is always considered to be positive, so if the first byte 
is &lt; 0, we pad with a zero to make it
      * positive
      *
      * @param  bytes       {@link BigInteger} bytes
@@ -87,7 +87,7 @@
     }
 
     /**
-     * The integer is always considered to be positive, so if the first byte 
is < 0, we pad with a zero to make it
+     * The integer is always considered to be positive, so if the first byte 
is &lt; 0, we pad with a zero to make it
      * positive
      *
      * @param  bytes       {@link BigInteger} bytes
--- 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/OsUtils.java
        2022-11-16 09:50:02.527293266 +0100
+++ 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/OsUtils.java
        2022-11-16 10:28:23.527039819 +0100
@@ -165,7 +165,7 @@
     }
 
     /**
-     * Remove {@code Windows} domain and/or group prefix as well as 
&quot;(User);&quot suffix
+     * Remove {@code Windows} domain and/or group prefix as well as 
&quot;(User);&quot; suffix
      *
      * @param  user The original username - ignored if {@code null}/empty
      * @return      The canonical user - unchanged if {@code Unix} O/S
--- 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/security/SecurityUtils.java
 2022-11-16 09:50:02.535293319 +0100
+++ 
apache-sshd-2.9.2/sshd-common/src/main/java/org/apache/sshd/common/util/security/SecurityUtils.java
 2022-11-16 10:31:13.564205742 +0100
@@ -119,7 +119,7 @@
     /**
      * The min. key size value used for testing whether Diffie-Hellman Group 
Exchange is supported or not. According to
      * <A HREF="https://tools.ietf.org/html/rfc4419";>RFC 4419</A> section 3: 
&quot;Servers and clients SHOULD support
-     * groups with a modulus length of k bits, where 1024 <= k <= 8192&quot;. 
</code>
+     * groups with a modulus length of k bits, where 1024 &lt;= k &lt;= 
8192&quot;. </code>
      *
      * <B>Note: this has been amended by <A 
HREF="https://tools.ietf.org/html/rfc8270";>RFC 8270</A>
      */
--- 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/client/session/ClientProxyConnector.java
  2022-11-16 09:50:02.571293565 +0100
+++ 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/client/session/ClientProxyConnector.java
  2022-11-16 10:28:51.175229400 +0100
@@ -23,8 +23,8 @@
 
 /**
  * Provides a way to implement proxied connections where some metadata about 
the client is sent <U>before</U> the actual
- * SSH protocol is executed - e.g., the <A 
HREF=@http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt";>PROXY
- * protocol</A>. The implementor should use the {@code 
IoSession#write(Buffer)} method to send any packets with the
+ * SSH protocol is executed - e.g., the <A 
HREF="http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt";>PROXY 
protocol</A>. 
+ * The implementor should use the {@code IoSession#write(Buffer)} method to 
send any packets with the
  * meta-data.
  *
  * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
--- 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java
   2022-11-16 09:50:02.575293593 +0100
+++ 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/BaseBuilder.java
   2022-11-16 10:04:31.529233186 +0100
@@ -67,7 +67,7 @@
 
     /**
      * The default {@link BuiltinCiphers} setup in order of preference as 
specified by
-     * <A 
HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&sektion=5";>ssh_config(5)</A>
+     * <A 
HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&amp;sektion=5";>ssh_config(5)</A>
      */
     public static final List<BuiltinCiphers> DEFAULT_CIPHERS_PREFERENCE = 
Collections.unmodifiableList(
             Arrays.asList(
@@ -83,7 +83,7 @@
 
     /**
      * The default {@link BuiltinDHFactories} setup in order of preference as 
specified by
-     * <A 
HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&sektion=5";> 
ssh_config(5)</A>
+     * <A 
HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&amp;sektion=5";> 
ssh_config(5)</A>
      */
     public static final List<BuiltinDHFactories> DEFAULT_KEX_PREFERENCE = 
Collections.unmodifiableList(
             Arrays.asList(
@@ -104,7 +104,7 @@
 
     /**
      * The default {@link BuiltinMacs} setup in order of preference as 
specified by
-     * <A 
HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&sektion=5";> 
ssh_config(5)</A>
+     * <A 
HREF="https://www.freebsd.org/cgi/man.cgi?query=ssh_config&amp;sektion=5";> 
ssh_config(5)</A>
      */
     public static final List<BuiltinMacs> DEFAULT_MAC_PREFERENCE = 
Collections.unmodifiableList(
             Arrays.asList(
--- 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/channel/LocalWindow.java
   2022-11-16 09:50:02.575293593 +0100
+++ 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/channel/LocalWindow.java
   2022-11-16 10:22:11.968492069 +0100
@@ -51,8 +51,6 @@
     /**
      * Initializes the {@link LocalWindow} with the packet and window sizes 
from the {@code resolver}.
      *
-     * @param size       the initial window size
-     * @param packetSize the peer's advertised maximum packet size
      * @param resolver   {@PropertyResolver} to access properties
      */
     public void init(PropertyResolver resolver) {
--- 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/KeyExchangeMessageHandler.java
     2022-11-16 09:50:02.579293619 +0100
+++ 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/KeyExchangeMessageHandler.java
     2022-11-16 10:49:31.567743605 +0100
@@ -46,7 +46,7 @@
 /**
  * Manages SSH message sending during a key exchange. RFC 4253 specifies that 
during a key exchange, no high-level
  * messages are to be sent, but a receiver must be able to deal with messages 
"in flight" until the peer's
- * {@link SshConstants#SSH_MSG_KEX_INIT} message is received.
+ * {@link SshConstants#SSH_MSG_KEXINIT} message is received.
  * <p>
  * Apache MINA sshd queues up high-level messages that threads try to send 
while a key exchange is ongoing, and sends
  * them once the key exchange is done. Sending queued messages may make the 
peer re-trigger a new key exchange, in which
@@ -154,7 +154,7 @@
     }
 
     /**
-     * Initializes the state for a new key exchange. {@link 
#allPacketsFlushed()} will be {@code false}, and a new
+     * Initializes the state for a new key exchange. <code>kexFlushed</code> 
will be {@code false}, and a new
      * future to be fulfilled when all queued packets will be flushed once the 
key exchange is done is set. The
      * currently set future from an earlier key exchange is returned. The 
returned future may or may not be fulfilled;
      * if it isn't, there are still left-over pending packets to write from 
the previous key exchange, which will be
@@ -406,7 +406,7 @@
      * exchange, flushing is stopped and is to be resumed by another call to 
this method when the new key exchange is
      * done.
      *
-     * @param flushDone the future obtained from {@link #getFlushedFuture()}; 
will be fulfilled once all pending packets
+     * @param flushDone the future obtained from {@link 
#terminateKeyExchange()}; will be fulfilled once all pending packets
      *                  have been written
      */
     protected void flushQueue(DefaultKeyExchangeFuture flushDone) {
--- 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java
       2022-11-16 09:50:02.579293619 +0100
+++ 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/common/session/Session.java
       2022-11-16 10:02:05.032231651 +0100
@@ -224,11 +224,11 @@
      * {@link Buffer} to the given {@link ReplyHandler}, which may execute in 
a different thread.
      *
      * <dl>
-     * <dt>want-reply == true && replyHandler != null</dt>
+     * <dt>want-reply == true &amp;&amp; replyHandler != null</dt>
      * <dd>The returned future is fulfilled with {@code null} when the request 
was sent, or with an exception if the
      * request could not be sent. The {@code replyHandler} is invoked once the 
reply is received, with the SSH reply
      * code and the data received.</dd>
-     * <dt>want-reply == true && replyHandler == null</dt>
+     * <dt>want-reply == true &amp;&amp; replyHandler == null</dt>
      * <dd>The returned future is fulfilled with an exception if the request 
could not be sent, or a failure reply was
      * received. If a success reply was received, the future is fulfilled with 
the received data buffer.</dd>
      * <dt>want-reply == false</dt>
--- 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/server/session/ServerProxyAcceptor.java
   2022-11-16 09:50:02.583293646 +0100
+++ 
apache-sshd-2.9.2/sshd-core/src/main/java/org/apache/sshd/server/session/ServerProxyAcceptor.java
   2022-11-16 10:33:44.345239622 +0100
@@ -23,8 +23,7 @@
 
 /**
  * Provides a way to implement proxied connections where some metadata about 
the client is sent <U>before</U> the actual
- * SSH protocol is executed - e.g., the <A 
HREF=@http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt";>PROXY
- * protocol</A>.
+ * SSH protocol is executed - e.g., the <A 
HREF="http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt";>PROXY 
protocol</A>.
  *
  * @author <a href="mailto:d...@mina.apache.org";>Apache MINA SSHD Project</a>
  */

Reply via email to