diff --git a/NOTICE b/NOTICE index fbe073e7..746fbdee 100644 --- a/NOTICE +++ b/NOTICE @@ -15,7 +15,7 @@ The Apache Software Foundation (http://www.apache.org/): == in this case for the SSHD distribution. == ========================================================================= - This product contains software developped by JCraft,Inc. and subject to + This product contains software developed by JCraft,Inc. and subject to the following license: Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Atsuhiko Yamanaka, JCraft,Inc. diff --git a/README.adoc b/README.adoc index 7f4f1a35..cd21ef6b 100644 --- a/README.adoc +++ b/README.adoc @@ -73,7 +73,7 @@ key exchange:: `diffie-hellman-group-exchange-sha1`, `diffie-hellman-group-exchange-sha256`, `ecdh-sha2-nistp256`, `ecdh-sha2-nistp384`, `ecdh-sha2-nistp521`, `curve25519-sha256@libssh.org` - SSHJ also supports the following extended (non official) key exchange algoriths: + SSHJ also supports the following extended (non official) key exchange algorithms: `diffie-hellman-group14-sha256@ssh.com`, `diffie-hellman-group15-sha256`, `diffie-hellman-group15-sha256@ssh.com`, `diffie-hellman-group15-sha384@ssh.com`, `diffie-hellman-group16-sha256`, `diffie-hellman-group16-sha384@ssh.com`, `diffie-hellman-group16-sha512@ssh.com`, `diffie-hellman-group18-sha512@ssh.com` @@ -152,7 +152,7 @@ SSHJ 0.19.1 (2016-12-30):: * Enabled PKCS5 Key files in DefaultConfig * Merged https://github.com/hierynomus/sshj/pulls/291[#291]: Fixed sshj.properties loading and chained exception messages * Merged https://github.com/hierynomus/sshj/pulls/284[#284]: Correctly catch interrupt in keepalive thread -* Fixed https://github.com/hierynomus/sshj/issues/292[#292]: Pass the configured RandomFactory to Diffie Hellmann KEX +* Fixed https://github.com/hierynomus/sshj/issues/292[#292]: Pass the configured RandomFactory to Diffie Hellman KEX * Fixed https://github.com/hierynomus/sshj/issues/256[#256]: SSHJ now builds if no git repository present * LocalPortForwarder now correctly interrupts its own thread on close() SSHJ 0.19.0 (2016-11-25):: diff --git a/src/main/java/com/hierynomus/sshj/transport/kex/DHGroups.java b/src/main/java/com/hierynomus/sshj/transport/kex/DHGroups.java index d182e2a5..6e4732ae 100644 --- a/src/main/java/com/hierynomus/sshj/transport/kex/DHGroups.java +++ b/src/main/java/com/hierynomus/sshj/transport/kex/DHGroups.java @@ -26,7 +26,7 @@ import java.math.BigInteger; import static net.schmizz.sshj.transport.kex.DHGroupData.*; /** - * Factory methods for Diffie Hellmann KEX algorithms based on MODP groups / Oakley Groups + * Factory methods for Diffie Hellman KEX algorithms based on MODP groups / Oakley Groups * * - https://tools.ietf.org/html/rfc4253 * - https://tools.ietf.org/html/draft-ietf-curdle-ssh-modp-dh-sha2-01 diff --git a/src/main/java/net/schmizz/concurrent/ExceptionChainer.java b/src/main/java/net/schmizz/concurrent/ExceptionChainer.java index cd3ed4e0..18488d1c 100644 --- a/src/main/java/net/schmizz/concurrent/ExceptionChainer.java +++ b/src/main/java/net/schmizz/concurrent/ExceptionChainer.java @@ -26,7 +26,7 @@ package net.schmizz.concurrent; * if (t instanceof SomeException) * return (SomeException) t; * else - * return new SomeExcepion(t); + * return new SomeException(t); * } * }; * diff --git a/src/main/java/net/schmizz/sshj/Config.java b/src/main/java/net/schmizz/sshj/Config.java index d973adf2..4d19a5dd 100644 --- a/src/main/java/net/schmizz/sshj/Config.java +++ b/src/main/java/net/schmizz/sshj/Config.java @@ -160,7 +160,7 @@ public interface Config { /** * Gets whether the client should first wait for a received server ident, before sending the client ident. *

- * NB: This is non-standard behaviour, and can potentially deadlock if the server also waits on the client ident. + * NB: This is non-standard behaviour, and can potentially deadlock if the server also waits on the client ident. * * The default value is set to false. * @@ -171,7 +171,7 @@ public interface Config { /** * Sets whether the SSH client should wait for a received server ident, before sending the client ident. *

- * NB: This is non-standard behaviour, and can potentially deadlock if the server also waits on the client ident. + * NB: This is non-standard behaviour, and can potentially deadlock if the server also waits on the client ident. * @param waitForServerIdentBeforeSendingClientIdent Whether to wait for the server ident. */ diff --git a/src/main/java/net/schmizz/sshj/SSHClient.java b/src/main/java/net/schmizz/sshj/SSHClient.java index f8492038..e89897c4 100644 --- a/src/main/java/net/schmizz/sshj/SSHClient.java +++ b/src/main/java/net/schmizz/sshj/SSHClient.java @@ -515,7 +515,7 @@ public class SSHClient } /** - * Utility function for createing a {@link KeyProvider} instance from given location on the file system. Creates a + * Utility function for creating a {@link KeyProvider} instance from given location on the file system. Creates a * one-off {@link PasswordFinder} using {@link PasswordUtils#createOneOff(char[])}, and calls {@link * #loadKeys(String, PasswordFinder)}. * @@ -754,7 +754,7 @@ public class SSHClient /** * Adds {@code zlib} compression to preferred compression algorithms. There is no guarantee that it will be - * successfully negotiatied. + * successfully negotiated. *

* If the client is already connected renegotiation is done; otherwise this method simply returns (and compression * will be negotiated during connection establishment). diff --git a/src/main/java/net/schmizz/sshj/common/Base64.java b/src/main/java/net/schmizz/sshj/common/Base64.java index e6c613a7..1778b201 100644 --- a/src/main/java/net/schmizz/sshj/common/Base64.java +++ b/src/main/java/net/schmizz/sshj/common/Base64.java @@ -76,7 +76,7 @@ package net.schmizz.sshj.common; * RFC3548. *

  • Throws exceptions instead of returning null values. Because some operations * (especially those that may permit the GZIP option) use IO streams, there - * is a possiblity of an java.io.IOException being thrown. After some discussion and + * is a possibility of an java.io.IOException being thrown. After some discussion and * thought, I've changed the behavior of the methods to throw java.io.IOExceptions * rather than return null if ever there's an error. I think this is more * appropriate, though it will require some changes to your code. Sorry, @@ -476,7 +476,7 @@ public class Base64 * anywhere along their length by specifying * srcOffset and destOffset. * This method does not check to make sure your arrays - * are large enough to accomodate srcOffset + 3 for + * are large enough to accommodate srcOffset + 3 for * the source array or destOffset + 4 for * the destination array. * The actual number of significant bytes in your array is @@ -1007,7 +1007,7 @@ public class Base64 * anywhere along their length by specifying * srcOffset and destOffset. * This method does not check to make sure your arrays - * are large enough to accomodate srcOffset + 4 for + * are large enough to accommodate srcOffset + 4 for * the source array or destOffset + 3 for * the destination array. * This method returns the actual number of bytes that @@ -1928,7 +1928,7 @@ public class Base64 if( suspendEncoding ) { this.out.write( theByte ); return; - } // end if: supsended + } // end if: suspended // Encode? if( encode ) { @@ -1983,7 +1983,7 @@ public class Base64 if( suspendEncoding ) { this.out.write( theBytes, off, len ); return; - } // end if: supsended + } // end if: suspended for( int i = 0; i < len; i++ ) { write( theBytes[ off + i ] ); diff --git a/src/main/java/net/schmizz/sshj/common/Factory.java b/src/main/java/net/schmizz/sshj/common/Factory.java index cd80f0d0..183fbea2 100644 --- a/src/main/java/net/schmizz/sshj/common/Factory.java +++ b/src/main/java/net/schmizz/sshj/common/Factory.java @@ -26,7 +26,7 @@ import java.util.List; public interface Factory { /** - * Inteface for a named factory. Named factories are simply factories that are identified by a name. Such names are + * Interface for a named factory. Named factories are simply factories that are identified by a name. Such names are * used mainly in SSH algorithm negotiation. * * @param type of object created by this factory diff --git a/src/main/java/net/schmizz/sshj/connection/channel/direct/AbstractDirectChannel.java b/src/main/java/net/schmizz/sshj/connection/channel/direct/AbstractDirectChannel.java index 2c432acc..3c2ecd29 100644 --- a/src/main/java/net/schmizz/sshj/connection/channel/direct/AbstractDirectChannel.java +++ b/src/main/java/net/schmizz/sshj/connection/channel/direct/AbstractDirectChannel.java @@ -28,7 +28,7 @@ import net.schmizz.sshj.transport.TransportException; import java.nio.charset.Charset; import java.util.concurrent.TimeUnit; -/** Base class for direct channels whose open is initated by the client. */ +/** Base class for direct channels whose open is initiated by the client. */ public abstract class AbstractDirectChannel extends AbstractChannel implements Channel.Direct { diff --git a/src/main/java/net/schmizz/sshj/connection/channel/direct/Session.java b/src/main/java/net/schmizz/sshj/connection/channel/direct/Session.java index 6619131e..4db0c646 100644 --- a/src/main/java/net/schmizz/sshj/connection/channel/direct/Session.java +++ b/src/main/java/net/schmizz/sshj/connection/channel/direct/Session.java @@ -191,7 +191,7 @@ public interface Session TransportException; /** - * Set an enviornment variable. + * Set an environment variable. * * @param name name of the variable * @param value value to set diff --git a/src/main/java/net/schmizz/sshj/connection/channel/forwarded/ForwardedChannelOpener.java b/src/main/java/net/schmizz/sshj/connection/channel/forwarded/ForwardedChannelOpener.java index 54525424..e4af9b11 100644 --- a/src/main/java/net/schmizz/sshj/connection/channel/forwarded/ForwardedChannelOpener.java +++ b/src/main/java/net/schmizz/sshj/connection/channel/forwarded/ForwardedChannelOpener.java @@ -28,7 +28,7 @@ public interface ForwardedChannelOpener { /** * Delegates a {@code SSH_MSG_CHANNEL_OPEN} request for the channel type claimed by this opener. * - * @param buf {@link SSHPacket} containg the request except for the message identifier and channel type field + * @param buf {@link SSHPacket} containing the request except for the message identifier and channel type field */ void handleOpen(SSHPacket buf) throws ConnectionException, TransportException; diff --git a/src/main/java/net/schmizz/sshj/transport/KeyExchanger.java b/src/main/java/net/schmizz/sshj/transport/KeyExchanger.java index 50f5b58d..b5b7e92a 100644 --- a/src/main/java/net/schmizz/sshj/transport/KeyExchanger.java +++ b/src/main/java/net/schmizz/sshj/transport/KeyExchanger.java @@ -94,7 +94,7 @@ final class KeyExchanger * Add a callback for host key verification. *

    * Any of the {@link HostKeyVerifier} implementations added this way can deem a host key to be acceptable, allowing - * key exchange to successfuly complete. Otherwise, a {@link TransportException} will result during key exchange. + * key exchange to successfully complete. Otherwise, a {@link TransportException} will result during key exchange. * * @param hkv object whose {@link HostKeyVerifier#verify} method will be invoked */ diff --git a/src/main/java/net/schmizz/sshj/transport/Transport.java b/src/main/java/net/schmizz/sshj/transport/Transport.java index eb26caa4..63419181 100644 --- a/src/main/java/net/schmizz/sshj/transport/Transport.java +++ b/src/main/java/net/schmizz/sshj/transport/Transport.java @@ -92,7 +92,7 @@ public interface Transport int getHeartbeatInterval(); /** - * @param interval the interval in seconds, {@code 0} means no hearbeat + * @param interval the interval in seconds, {@code 0} means no heartbeat * @deprecated Moved to {@link net.schmizz.keepalive.KeepAlive#getKeepAliveInterval()}. This is accessible through the {@link net.schmizz.sshj.connection.Connection}. * Scheduled to be removed in 0.12.0 */ @@ -156,7 +156,7 @@ public interface Transport * * @return the sequence number of the packet sent * - * @throws TransportException if an error occured sending the packet + * @throws TransportException if an error occurred sending the packet */ long sendUnimplemented() throws TransportException; diff --git a/src/main/java/net/schmizz/sshj/transport/TransportImpl.java b/src/main/java/net/schmizz/sshj/transport/TransportImpl.java index 1bcf2ce0..08de5210 100644 --- a/src/main/java/net/schmizz/sshj/transport/TransportImpl.java +++ b/src/main/java/net/schmizz/sshj/transport/TransportImpl.java @@ -485,8 +485,8 @@ public final class TransportImpl * This method is called in the context of the {@link #reader} thread via {@link Decoder#received} when a full * packet has been decoded. * - * @param msg the message identifer - * @param buf buffer containg rest of the packet + * @param msg the message identifier + * @param buf buffer containing rest of the packet * @throws SSHException if an error occurs during handling (unrecoverable) */ @Override diff --git a/src/main/java/net/schmizz/sshj/userauth/method/AuthPublickey.java b/src/main/java/net/schmizz/sshj/userauth/method/AuthPublickey.java index 2027a938..360beb50 100644 --- a/src/main/java/net/schmizz/sshj/userauth/method/AuthPublickey.java +++ b/src/main/java/net/schmizz/sshj/userauth/method/AuthPublickey.java @@ -24,7 +24,7 @@ import net.schmizz.sshj.userauth.keyprovider.KeyProvider; /** * Implements the {@code "publickey"} SSH authentication method. *

    - * Requesteing authentication with this method first sends a "feeler" request with just the public key, and if the + * Requesting authentication with this method first sends a "feeler" request with just the public key, and if the * server responds with {@code SSH_MSG_USERAUTH_PK_OK} indicating that the key is acceptable, it proceeds to send a * request signed with the private key. Therefore, private keys are not requested from the associated {@link * KeyProvider} unless needed.