From 28d57840ab5ea87635b3c1a6fe9e659ef2f792e3 Mon Sep 17 00:00:00 2001 From: Jeroen van Erp Date: Tue, 19 Sep 2017 17:22:55 -0400 Subject: [PATCH] Organised imports --- .../sshj/backport/Jdk7HttpProxySocket.java | 4 +- .../sshj/transport/kex/DHGroups.java | 7 ++-- .../keyprovider/OpenSSHKeyV1KeyFile.java | 16 ++++---- .../java/net/schmizz/concurrent/Event.java | 4 +- .../java/net/schmizz/concurrent/Promise.java | 3 +- .../java/net/schmizz/sshj/ConfigImpl.java | 2 +- .../java/net/schmizz/sshj/DefaultConfig.java | 31 +++------------- src/main/java/net/schmizz/sshj/SSHClient.java | 6 +-- .../sshj/common/ECDSAVariationsAdapter.java | 19 +++++----- .../java/net/schmizz/sshj/common/KeyType.java | 35 ++++++++---------- .../schmizz/sshj/common/SecurityUtils.java | 7 ++-- .../sshj/signature/SignatureECDSA.java | 15 ++++---- .../sshj/transport/kex/Curve25519DH.java | 12 +++--- .../sshj/transport/random/JCERandom.java | 3 +- .../keyprovider/BaseFileKeyProvider.java | 6 +-- .../userauth/keyprovider/KeyProviderUtil.java | 2 +- .../userauth/keyprovider/PKCS5KeyFile.java | 16 ++++---- .../userauth/keyprovider/PKCS8KeyFile.java | 8 ++-- .../userauth/keyprovider/PuTTYKeyFile.java | 18 ++++----- .../sshj/xfer/AbstractFileTransfer.java | 1 - .../direct/LocalPortForwarderSpec.groovy | 2 - .../verification/KnownHostMatchersTest.groovy | 1 - .../com/hierynomus/sshj/IntegrationTest.java | 10 ++--- .../net/schmizz/sshj/common/BufferTest.java | 5 +-- .../sshj/keyprovider/OpenSSHKeyFileTest.java | 37 ++++++++----------- .../net/schmizz/sshj/sftp/SFTPClientTest.java | 3 +- .../sshj/signature/VerificationTest.java | 7 ++-- .../net/schmizz/sshj/util/BufferTest.java | 1 - .../sshj/util/gss/BogusGSSContext.java | 3 +- 29 files changed, 121 insertions(+), 163 deletions(-) diff --git a/src/main/java/com/hierynomus/sshj/backport/Jdk7HttpProxySocket.java b/src/main/java/com/hierynomus/sshj/backport/Jdk7HttpProxySocket.java index a0d61725..56ea256e 100644 --- a/src/main/java/com/hierynomus/sshj/backport/Jdk7HttpProxySocket.java +++ b/src/main/java/com/hierynomus/sshj/backport/Jdk7HttpProxySocket.java @@ -15,12 +15,12 @@ */ package com.hierynomus.sshj.backport; +import net.schmizz.sshj.common.IOUtils; + import java.io.IOException; import java.io.InputStream; import java.net.*; -import net.schmizz.sshj.common.IOUtils; - public class Jdk7HttpProxySocket extends Socket { private Proxy httpProxy = null; 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 3efbddd8..d182e2a5 100644 --- a/src/main/java/com/hierynomus/sshj/transport/kex/DHGroups.java +++ b/src/main/java/com/hierynomus/sshj/transport/kex/DHGroups.java @@ -15,14 +15,15 @@ */ package com.hierynomus.sshj.transport.kex; -import net.schmizz.sshj.transport.digest.*; +import net.schmizz.sshj.transport.digest.Digest; +import net.schmizz.sshj.transport.digest.SHA1; +import net.schmizz.sshj.transport.digest.SHA256; +import net.schmizz.sshj.transport.digest.SHA512; import net.schmizz.sshj.transport.kex.KeyExchange; import java.math.BigInteger; import static net.schmizz.sshj.transport.kex.DHGroupData.*; -import static net.schmizz.sshj.transport.kex.DHGroupData.P16; -import static net.schmizz.sshj.transport.kex.DHGroupData.P18; /** * Factory methods for Diffie Hellmann KEX algorithms based on MODP groups / Oakley Groups diff --git a/src/main/java/com/hierynomus/sshj/userauth/keyprovider/OpenSSHKeyV1KeyFile.java b/src/main/java/com/hierynomus/sshj/userauth/keyprovider/OpenSSHKeyV1KeyFile.java index 1d28f148..f38a673e 100644 --- a/src/main/java/com/hierynomus/sshj/userauth/keyprovider/OpenSSHKeyV1KeyFile.java +++ b/src/main/java/com/hierynomus/sshj/userauth/keyprovider/OpenSSHKeyV1KeyFile.java @@ -15,14 +15,6 @@ */ package com.hierynomus.sshj.userauth.keyprovider; -import java.io.BufferedReader; -import java.io.IOException; -import java.security.GeneralSecurityException; -import java.security.KeyPair; -import java.security.PublicKey; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import net.i2p.crypto.eddsa.EdDSAPrivateKey; import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable; import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec; @@ -31,6 +23,14 @@ import net.schmizz.sshj.common.Buffer.PlainBuffer; import net.schmizz.sshj.userauth.keyprovider.BaseFileKeyProvider; import net.schmizz.sshj.userauth.keyprovider.FileKeyProvider; import net.schmizz.sshj.userauth.keyprovider.KeyFormat; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.BufferedReader; +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.KeyPair; +import java.security.PublicKey; import static net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable.CURVE_ED25519_SHA512; diff --git a/src/main/java/net/schmizz/concurrent/Event.java b/src/main/java/net/schmizz/concurrent/Event.java index b5a449fb..d02cd932 100644 --- a/src/main/java/net/schmizz/concurrent/Event.java +++ b/src/main/java/net/schmizz/concurrent/Event.java @@ -15,11 +15,11 @@ */ package net.schmizz.concurrent; +import net.schmizz.sshj.common.LoggerFactory; + import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; -import net.schmizz.sshj.common.LoggerFactory; - /** * An event can be set, cleared, or awaited, similar to Python's {@code threading.event}. The key difference is that a * waiter may be delivered an exception of parameterized type {@code T}. diff --git a/src/main/java/net/schmizz/concurrent/Promise.java b/src/main/java/net/schmizz/concurrent/Promise.java index 8e6cce3f..7511648d 100644 --- a/src/main/java/net/schmizz/concurrent/Promise.java +++ b/src/main/java/net/schmizz/concurrent/Promise.java @@ -15,6 +15,7 @@ */ package net.schmizz.concurrent; +import net.schmizz.sshj.common.LoggerFactory; import org.slf4j.Logger; import java.util.concurrent.TimeUnit; @@ -22,8 +23,6 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; -import net.schmizz.sshj.common.LoggerFactory; - /** * Represents promised data of the parameterized type {@code V} and allows waiting on it. An exception may also be * delivered to a waiter, and will be of the parameterized type {@code T}. diff --git a/src/main/java/net/schmizz/sshj/ConfigImpl.java b/src/main/java/net/schmizz/sshj/ConfigImpl.java index fce2cfda..70df287c 100644 --- a/src/main/java/net/schmizz/sshj/ConfigImpl.java +++ b/src/main/java/net/schmizz/sshj/ConfigImpl.java @@ -16,8 +16,8 @@ package net.schmizz.sshj; import net.schmizz.keepalive.KeepAliveProvider; -import net.schmizz.sshj.common.LoggerFactory; import net.schmizz.sshj.common.Factory; +import net.schmizz.sshj.common.LoggerFactory; import net.schmizz.sshj.signature.Signature; import net.schmizz.sshj.transport.cipher.Cipher; import net.schmizz.sshj.transport.compression.Compression; diff --git a/src/main/java/net/schmizz/sshj/DefaultConfig.java b/src/main/java/net/schmizz/sshj/DefaultConfig.java index 256b4e31..9db34a8c 100644 --- a/src/main/java/net/schmizz/sshj/DefaultConfig.java +++ b/src/main/java/net/schmizz/sshj/DefaultConfig.java @@ -15,22 +15,12 @@ */ package net.schmizz.sshj; -import java.io.IOException; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Properties; - -import org.slf4j.Logger; - import com.hierynomus.sshj.signature.SignatureEdDSA; import com.hierynomus.sshj.transport.cipher.BlockCiphers; import com.hierynomus.sshj.transport.cipher.StreamCiphers; import com.hierynomus.sshj.transport.kex.DHGroups; import com.hierynomus.sshj.transport.kex.ExtendedDHGroups; import com.hierynomus.sshj.userauth.keyprovider.OpenSSHKeyV1KeyFile; - import net.schmizz.keepalive.KeepAliveProvider; import net.schmizz.sshj.common.Factory; import net.schmizz.sshj.common.LoggerFactory; @@ -38,26 +28,13 @@ import net.schmizz.sshj.common.SecurityUtils; import net.schmizz.sshj.signature.SignatureDSA; import net.schmizz.sshj.signature.SignatureECDSA; import net.schmizz.sshj.signature.SignatureRSA; -import net.schmizz.sshj.transport.cipher.AES128CBC; -import net.schmizz.sshj.transport.cipher.AES128CTR; -import net.schmizz.sshj.transport.cipher.AES192CBC; -import net.schmizz.sshj.transport.cipher.AES192CTR; -import net.schmizz.sshj.transport.cipher.AES256CBC; -import net.schmizz.sshj.transport.cipher.AES256CTR; -import net.schmizz.sshj.transport.cipher.BlowfishCBC; -import net.schmizz.sshj.transport.cipher.Cipher; -import net.schmizz.sshj.transport.cipher.TripleDESCBC; +import net.schmizz.sshj.transport.cipher.*; import net.schmizz.sshj.transport.compression.NoneCompression; import net.schmizz.sshj.transport.kex.Curve25519SHA256; import net.schmizz.sshj.transport.kex.DHGexSHA1; import net.schmizz.sshj.transport.kex.DHGexSHA256; import net.schmizz.sshj.transport.kex.ECDHNistP; -import net.schmizz.sshj.transport.mac.HMACMD5; -import net.schmizz.sshj.transport.mac.HMACMD596; -import net.schmizz.sshj.transport.mac.HMACSHA1; -import net.schmizz.sshj.transport.mac.HMACSHA196; -import net.schmizz.sshj.transport.mac.HMACSHA2256; -import net.schmizz.sshj.transport.mac.HMACSHA2512; +import net.schmizz.sshj.transport.mac.*; import net.schmizz.sshj.transport.random.BouncyCastleRandom; import net.schmizz.sshj.transport.random.JCERandom; import net.schmizz.sshj.transport.random.SingletonRandomFactory; @@ -65,6 +42,10 @@ import net.schmizz.sshj.userauth.keyprovider.OpenSSHKeyFile; import net.schmizz.sshj.userauth.keyprovider.PKCS5KeyFile; import net.schmizz.sshj.userauth.keyprovider.PKCS8KeyFile; import net.schmizz.sshj.userauth.keyprovider.PuTTYKeyFile; +import org.slf4j.Logger; + +import java.io.IOException; +import java.util.*; /** * A {@link net.schmizz.sshj.Config} that is initialized as follows. Items marked with an asterisk are added to the config only if diff --git a/src/main/java/net/schmizz/sshj/SSHClient.java b/src/main/java/net/schmizz/sshj/SSHClient.java index f210cd8e..469a15ad 100644 --- a/src/main/java/net/schmizz/sshj/SSHClient.java +++ b/src/main/java/net/schmizz/sshj/SSHClient.java @@ -15,11 +15,7 @@ */ package net.schmizz.sshj; -import net.schmizz.sshj.common.Factory; -import net.schmizz.sshj.common.IOUtils; -import net.schmizz.sshj.common.LoggerFactory; -import net.schmizz.sshj.common.SSHException; -import net.schmizz.sshj.common.SecurityUtils; +import net.schmizz.sshj.common.*; import net.schmizz.sshj.connection.Connection; import net.schmizz.sshj.connection.ConnectionException; import net.schmizz.sshj.connection.ConnectionImpl; diff --git a/src/main/java/net/schmizz/sshj/common/ECDSAVariationsAdapter.java b/src/main/java/net/schmizz/sshj/common/ECDSAVariationsAdapter.java index 770825f2..3b54be58 100644 --- a/src/main/java/net/schmizz/sshj/common/ECDSAVariationsAdapter.java +++ b/src/main/java/net/schmizz/sshj/common/ECDSAVariationsAdapter.java @@ -15,6 +15,15 @@ */ package net.schmizz.sshj.common; +import com.hierynomus.sshj.secg.SecgUtils; +import org.bouncycastle.asn1.nist.NISTNamedCurves; +import org.bouncycastle.asn1.x9.X9ECParameters; +import org.bouncycastle.jce.spec.ECParameterSpec; +import org.bouncycastle.jce.spec.ECPublicKeySpec; +import org.bouncycastle.math.ec.ECPoint; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.math.BigInteger; import java.security.GeneralSecurityException; import java.security.Key; @@ -26,16 +35,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.bouncycastle.asn1.nist.NISTNamedCurves; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.jce.spec.ECParameterSpec; -import org.bouncycastle.jce.spec.ECPublicKeySpec; -import org.bouncycastle.math.ec.ECPoint; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.hierynomus.sshj.secg.SecgUtils; - class ECDSAVariationsAdapter { private final static String BASE_ALGORITHM_NAME = "ecdsa-sha2-nistp"; diff --git a/src/main/java/net/schmizz/sshj/common/KeyType.java b/src/main/java/net/schmizz/sshj/common/KeyType.java index c382a3ef..e82f093c 100644 --- a/src/main/java/net/schmizz/sshj/common/KeyType.java +++ b/src/main/java/net/schmizz/sshj/common/KeyType.java @@ -15,33 +15,28 @@ */ package net.schmizz.sshj.common; -import java.math.BigInteger; -import java.security.GeneralSecurityException; -import java.security.Key; -import java.security.KeyFactory; -import java.security.PublicKey; -import java.security.interfaces.*; -import java.security.spec.DSAPublicKeySpec; -import java.security.spec.RSAPublicKeySpec; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.hierynomus.sshj.signature.Ed25519PublicKey; import com.hierynomus.sshj.userauth.certificate.Certificate; - import net.i2p.crypto.eddsa.EdDSAPublicKey; import net.i2p.crypto.eddsa.spec.EdDSANamedCurveSpec; import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable; import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec; import net.schmizz.sshj.common.Buffer.BufferException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.math.BigInteger; +import java.security.GeneralSecurityException; +import java.security.Key; +import java.security.KeyFactory; +import java.security.PublicKey; +import java.security.interfaces.DSAPrivateKey; +import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.RSAPrivateKey; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.DSAPublicKeySpec; +import java.security.spec.RSAPublicKeySpec; +import java.util.*; /** Type of key e.g. rsa, dsa */ public enum KeyType { diff --git a/src/main/java/net/schmizz/sshj/common/SecurityUtils.java b/src/main/java/net/schmizz/sshj/common/SecurityUtils.java index a549b90c..62da004e 100644 --- a/src/main/java/net/schmizz/sshj/common/SecurityUtils.java +++ b/src/main/java/net/schmizz/sshj/common/SecurityUtils.java @@ -15,13 +15,14 @@ */ package net.schmizz.sshj.common; -import java.security.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import javax.crypto.Cipher; import javax.crypto.KeyAgreement; import javax.crypto.Mac; import javax.crypto.NoSuchPaddingException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.security.*; import static java.lang.String.format; diff --git a/src/main/java/net/schmizz/sshj/signature/SignatureECDSA.java b/src/main/java/net/schmizz/sshj/signature/SignatureECDSA.java index 7125173f..c2e37faa 100644 --- a/src/main/java/net/schmizz/sshj/signature/SignatureECDSA.java +++ b/src/main/java/net/schmizz/sshj/signature/SignatureECDSA.java @@ -15,19 +15,18 @@ */ package net.schmizz.sshj.signature; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.math.BigInteger; -import java.security.SignatureException; - +import net.schmizz.sshj.common.Buffer; +import net.schmizz.sshj.common.KeyType; +import net.schmizz.sshj.common.SSHRuntimeException; import org.bouncycastle.asn1.ASN1EncodableVector; import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1OutputStream; import org.bouncycastle.asn1.DERSequence; -import net.schmizz.sshj.common.Buffer; -import net.schmizz.sshj.common.KeyType; -import net.schmizz.sshj.common.SSHRuntimeException; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.SignatureException; /** ECDSA {@link Signature} */ public class SignatureECDSA extends AbstractSignature { diff --git a/src/main/java/net/schmizz/sshj/transport/kex/Curve25519DH.java b/src/main/java/net/schmizz/sshj/transport/kex/Curve25519DH.java index 17c64584..01bd2238 100644 --- a/src/main/java/net/schmizz/sshj/transport/kex/Curve25519DH.java +++ b/src/main/java/net/schmizz/sshj/transport/kex/Curve25519DH.java @@ -15,16 +15,16 @@ */ package net.schmizz.sshj.transport.kex; -import java.math.BigInteger; -import java.security.GeneralSecurityException; -import java.security.spec.AlgorithmParameterSpec; -import java.util.Arrays; +import net.schmizz.sshj.common.Factory; +import net.schmizz.sshj.transport.random.Random; import org.bouncycastle.asn1.x9.X9ECParameters; import org.bouncycastle.crypto.ec.CustomNamedCurves; import org.bouncycastle.jce.spec.ECParameterSpec; -import net.schmizz.sshj.common.Factory; -import net.schmizz.sshj.transport.random.Random; +import java.math.BigInteger; +import java.security.GeneralSecurityException; +import java.security.spec.AlgorithmParameterSpec; +import java.util.Arrays; public class Curve25519DH extends DHBase { diff --git a/src/main/java/net/schmizz/sshj/transport/random/JCERandom.java b/src/main/java/net/schmizz/sshj/transport/random/JCERandom.java index a85710e0..cb913623 100644 --- a/src/main/java/net/schmizz/sshj/transport/random/JCERandom.java +++ b/src/main/java/net/schmizz/sshj/transport/random/JCERandom.java @@ -15,10 +15,11 @@ */ package net.schmizz.sshj.transport.random; -import java.security.SecureRandom; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.security.SecureRandom; + /** A {@link Random} implementation using the built-in {@link SecureRandom} PRNG. */ public class JCERandom implements Random { diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/BaseFileKeyProvider.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/BaseFileKeyProvider.java index d209e057..f4e7580e 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/BaseFileKeyProvider.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/BaseFileKeyProvider.java @@ -15,6 +15,9 @@ */ package net.schmizz.sshj.userauth.keyprovider; +import net.schmizz.sshj.common.KeyType; +import net.schmizz.sshj.userauth.password.*; + import java.io.File; import java.io.IOException; import java.io.Reader; @@ -22,9 +25,6 @@ import java.security.KeyPair; import java.security.PrivateKey; import java.security.PublicKey; -import net.schmizz.sshj.common.KeyType; -import net.schmizz.sshj.userauth.password.*; - public abstract class BaseFileKeyProvider implements FileKeyProvider { protected Resource resource; protected PasswordFinder pwdf; diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/KeyProviderUtil.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/KeyProviderUtil.java index eb5246d4..cd003d44 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/KeyProviderUtil.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/KeyProviderUtil.java @@ -15,10 +15,10 @@ */ package net.schmizz.sshj.userauth.keyprovider; +import com.hierynomus.sshj.userauth.keyprovider.OpenSSHKeyV1KeyFile; import net.schmizz.sshj.common.IOUtils; import java.io.*; -import com.hierynomus.sshj.userauth.keyprovider.OpenSSHKeyV1KeyFile; public class KeyProviderUtil { diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS5KeyFile.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS5KeyFile.java index 1befe88d..766717f4 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS5KeyFile.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS5KeyFile.java @@ -15,6 +15,14 @@ */ package net.schmizz.sshj.userauth.keyprovider; +import net.schmizz.sshj.common.Base64; +import net.schmizz.sshj.common.ByteArrayUtils; +import net.schmizz.sshj.common.IOUtils; +import net.schmizz.sshj.common.KeyType; +import net.schmizz.sshj.transport.cipher.*; +import net.schmizz.sshj.transport.digest.Digest; +import net.schmizz.sshj.transport.digest.MD5; + import java.io.BufferedReader; import java.io.EOFException; import java.io.IOException; @@ -25,14 +33,6 @@ import java.security.*; import java.security.spec.*; import java.util.Arrays; -import net.schmizz.sshj.common.Base64; -import net.schmizz.sshj.common.ByteArrayUtils; -import net.schmizz.sshj.common.IOUtils; -import net.schmizz.sshj.common.KeyType; -import net.schmizz.sshj.transport.cipher.*; -import net.schmizz.sshj.transport.digest.Digest; -import net.schmizz.sshj.transport.digest.MD5; - /** * Represents a PKCS5-encoded key file. This is the format typically used by OpenSSH, OpenSSL, Amazon, etc. */ diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java index 26f50058..2c012c3d 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java @@ -15,8 +15,8 @@ */ package net.schmizz.sshj.userauth.keyprovider; -import java.io.IOException; -import java.security.KeyPair; +import net.schmizz.sshj.common.IOUtils; +import net.schmizz.sshj.userauth.password.PasswordUtils; import org.bouncycastle.openssl.EncryptionException; import org.bouncycastle.openssl.PEMEncryptedKeyPair; import org.bouncycastle.openssl.PEMKeyPair; @@ -26,8 +26,8 @@ import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.schmizz.sshj.common.IOUtils; -import net.schmizz.sshj.userauth.password.PasswordUtils; +import java.io.IOException; +import java.security.KeyPair; /** Represents a PKCS8-encoded key file. This is the format used by (old-style) OpenSSH and OpenSSL. */ public class PKCS8KeyFile extends BaseFileKeyProvider { diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PuTTYKeyFile.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PuTTYKeyFile.java index 54d9f08b..5a8ec681 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PuTTYKeyFile.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PuTTYKeyFile.java @@ -15,21 +15,21 @@ */ package net.schmizz.sshj.userauth.keyprovider; +import net.schmizz.sshj.common.Base64; +import net.schmizz.sshj.common.KeyType; +import net.schmizz.sshj.userauth.password.PasswordUtils; +import org.bouncycastle.util.encoders.Hex; + +import javax.crypto.Cipher; +import javax.crypto.Mac; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; import java.io.*; import java.math.BigInteger; import java.security.*; import java.security.spec.*; import java.util.HashMap; import java.util.Map; -import javax.crypto.Cipher; -import javax.crypto.Mac; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; -import org.bouncycastle.util.encoders.Hex; - -import net.schmizz.sshj.common.Base64; -import net.schmizz.sshj.common.KeyType; -import net.schmizz.sshj.userauth.password.PasswordUtils; /** *

Sample PuTTY file format

diff --git a/src/main/java/net/schmizz/sshj/xfer/AbstractFileTransfer.java b/src/main/java/net/schmizz/sshj/xfer/AbstractFileTransfer.java index 3a59406c..bf71fd1a 100644 --- a/src/main/java/net/schmizz/sshj/xfer/AbstractFileTransfer.java +++ b/src/main/java/net/schmizz/sshj/xfer/AbstractFileTransfer.java @@ -16,7 +16,6 @@ package net.schmizz.sshj.xfer; import net.schmizz.sshj.common.LoggerFactory; - import org.slf4j.Logger; public abstract class AbstractFileTransfer { diff --git a/src/test/groovy/com/hierynomus/sshj/connection/channel/direct/LocalPortForwarderSpec.groovy b/src/test/groovy/com/hierynomus/sshj/connection/channel/direct/LocalPortForwarderSpec.groovy index e7f8f593..aa4fc221 100644 --- a/src/test/groovy/com/hierynomus/sshj/connection/channel/direct/LocalPortForwarderSpec.groovy +++ b/src/test/groovy/com/hierynomus/sshj/connection/channel/direct/LocalPortForwarderSpec.groovy @@ -21,8 +21,6 @@ import org.junit.Rule import spock.lang.Specification import spock.util.concurrent.PollingConditions -import java.util.concurrent.CountDownLatch - class LocalPortForwarderSpec extends Specification { @Rule SshFixture tunnelFixture = new SshFixture() diff --git a/src/test/groovy/com/hierynomus/sshj/transport/verification/KnownHostMatchersTest.groovy b/src/test/groovy/com/hierynomus/sshj/transport/verification/KnownHostMatchersTest.groovy index 4eee4756..715989fd 100644 --- a/src/test/groovy/com/hierynomus/sshj/transport/verification/KnownHostMatchersTest.groovy +++ b/src/test/groovy/com/hierynomus/sshj/transport/verification/KnownHostMatchersTest.groovy @@ -15,7 +15,6 @@ */ package com.hierynomus.sshj.transport.verification -import com.hierynomus.sshj.transport.verification.KnownHostMatchers import spock.lang.Specification import spock.lang.Unroll diff --git a/src/test/java/com/hierynomus/sshj/IntegrationTest.java b/src/test/java/com/hierynomus/sshj/IntegrationTest.java index b6f97768..8ee1e709 100644 --- a/src/test/java/com/hierynomus/sshj/IntegrationTest.java +++ b/src/test/java/com/hierynomus/sshj/IntegrationTest.java @@ -15,14 +15,14 @@ */ package com.hierynomus.sshj; -import java.io.File; -import java.io.IOException; -import org.junit.Ignore; -import org.junit.Test; - import net.schmizz.sshj.DefaultConfig; import net.schmizz.sshj.SSHClient; import net.schmizz.sshj.transport.verification.OpenSSHKnownHosts; +import org.junit.Ignore; +import org.junit.Test; + +import java.io.File; +import java.io.IOException; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/src/test/java/net/schmizz/sshj/common/BufferTest.java b/src/test/java/net/schmizz/sshj/common/BufferTest.java index 2d2de53c..98a7a203 100644 --- a/src/test/java/net/schmizz/sshj/common/BufferTest.java +++ b/src/test/java/net/schmizz/sshj/common/BufferTest.java @@ -17,12 +17,11 @@ package net.schmizz.sshj.common; import net.schmizz.sshj.common.Buffer.BufferException; import net.schmizz.sshj.common.Buffer.PlainBuffer; - -import static org.junit.Assert.*; +import org.junit.Test; import java.math.BigInteger; -import org.junit.Test; +import static org.junit.Assert.*; public class BufferTest { diff --git a/src/test/java/net/schmizz/sshj/keyprovider/OpenSSHKeyFileTest.java b/src/test/java/net/schmizz/sshj/keyprovider/OpenSSHKeyFileTest.java index 18cb3dc6..cc60399a 100644 --- a/src/test/java/net/schmizz/sshj/keyprovider/OpenSSHKeyFileTest.java +++ b/src/test/java/net/schmizz/sshj/keyprovider/OpenSSHKeyFileTest.java @@ -15,13 +15,18 @@ */ package net.schmizz.sshj.keyprovider; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import com.hierynomus.sshj.userauth.certificate.Certificate; +import com.hierynomus.sshj.userauth.keyprovider.OpenSSHKeyV1KeyFile; +import net.schmizz.sshj.common.KeyType; +import net.schmizz.sshj.userauth.keyprovider.FileKeyProvider; +import net.schmizz.sshj.userauth.keyprovider.OpenSSHKeyFile; +import net.schmizz.sshj.userauth.password.PasswordFinder; +import net.schmizz.sshj.userauth.password.PasswordUtils; +import net.schmizz.sshj.userauth.password.Resource; +import net.schmizz.sshj.util.KeyUtil; +import org.apache.sshd.common.util.SecurityUtils; +import org.junit.Before; +import org.junit.Test; import java.io.File; import java.io.IOException; @@ -39,20 +44,10 @@ import java.util.Date; import java.util.Map; import java.util.Scanner; -import org.apache.sshd.common.util.SecurityUtils; -import org.junit.Before; -import org.junit.Test; - -import com.hierynomus.sshj.userauth.certificate.Certificate; -import com.hierynomus.sshj.userauth.keyprovider.OpenSSHKeyV1KeyFile; - -import net.schmizz.sshj.common.KeyType; -import net.schmizz.sshj.userauth.keyprovider.FileKeyProvider; -import net.schmizz.sshj.userauth.keyprovider.OpenSSHKeyFile; -import net.schmizz.sshj.userauth.password.PasswordFinder; -import net.schmizz.sshj.userauth.password.PasswordUtils; -import net.schmizz.sshj.userauth.password.Resource; -import net.schmizz.sshj.util.KeyUtil; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.*; public class OpenSSHKeyFileTest { diff --git a/src/test/java/net/schmizz/sshj/sftp/SFTPClientTest.java b/src/test/java/net/schmizz/sshj/sftp/SFTPClientTest.java index eb6dfaae..bf2c25df 100644 --- a/src/test/java/net/schmizz/sshj/sftp/SFTPClientTest.java +++ b/src/test/java/net/schmizz/sshj/sftp/SFTPClientTest.java @@ -15,13 +15,12 @@ */ package net.schmizz.sshj.sftp; +import net.schmizz.sshj.common.LoggerFactory; import org.junit.Before; import org.junit.Test; import java.io.IOException; -import net.schmizz.sshj.common.LoggerFactory; - import static net.schmizz.sshj.sftp.PathHelper.DEFAULT_PATH_SEPARATOR; import static org.mockito.Mockito.*; diff --git a/src/test/java/net/schmizz/sshj/signature/VerificationTest.java b/src/test/java/net/schmizz/sshj/signature/VerificationTest.java index 57f33b13..79f3f2b6 100644 --- a/src/test/java/net/schmizz/sshj/signature/VerificationTest.java +++ b/src/test/java/net/schmizz/sshj/signature/VerificationTest.java @@ -15,13 +15,12 @@ */ package net.schmizz.sshj.signature; -import java.security.PublicKey; - +import net.schmizz.sshj.common.Buffer; +import net.schmizz.sshj.common.Buffer.BufferException; import org.junit.Assert; import org.junit.Test; -import net.schmizz.sshj.common.Buffer; -import net.schmizz.sshj.common.Buffer.BufferException; +import java.security.PublicKey; public class VerificationTest { diff --git a/src/test/java/net/schmizz/sshj/util/BufferTest.java b/src/test/java/net/schmizz/sshj/util/BufferTest.java index 0d3316d5..39dce85f 100644 --- a/src/test/java/net/schmizz/sshj/util/BufferTest.java +++ b/src/test/java/net/schmizz/sshj/util/BufferTest.java @@ -32,7 +32,6 @@ package net.schmizz.sshj.util; import net.schmizz.sshj.common.Buffer; import net.schmizz.sshj.common.IOUtils; - import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/net/schmizz/sshj/util/gss/BogusGSSContext.java b/src/test/java/net/schmizz/sshj/util/gss/BogusGSSContext.java index 69000fad..ee361a31 100644 --- a/src/test/java/net/schmizz/sshj/util/gss/BogusGSSContext.java +++ b/src/test/java/net/schmizz/sshj/util/gss/BogusGSSContext.java @@ -15,9 +15,8 @@ */ package net.schmizz.sshj.util.gss; -import org.ietf.jgss.*; - import net.schmizz.sshj.common.IOUtils; +import org.ietf.jgss.*; import java.io.InputStream; import java.io.OutputStream;