Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:lkundrak:java-for-push
orion-ssh2
orion-ssh2-213-imports.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File orion-ssh2-213-imports.patch of Package orion-ssh2
From 4de80ea9672da93bf7f321c507b1474f7c132135 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak@v3.sk> Date: Fri, 5 Mar 2010 12:10:39 +0100 Subject: [PATCH 1/2] Import our classes only after we imported system classes No idea exactly why, this was imported from IntelliJ IDEA community edition repository. --- examples/Basic.java | 8 +++--- examples/BasicWithHTTPProxy.java | 10 +++--- examples/PortForwarding.java | 6 ++-- examples/PublicKeyAuthentication.java | 8 +---- examples/SingleThreadStdoutStderr.java | 6 ++-- examples/StdoutAndStderr.java | 8 +++--- examples/SwingShell.java | 26 +++--------------- examples/UsingKnownHosts.java | 8 +---- src/com/trilead/ssh2/Connection.java | 23 ++++++++++------ src/com/trilead/ssh2/KnownHosts.java | 23 +++++---------- src/com/trilead/ssh2/LocalPortForwarder.java | 6 ++-- src/com/trilead/ssh2/LocalStreamForwarder.java | 8 +++--- src/com/trilead/ssh2/SCPClient.java | 9 +----- src/com/trilead/ssh2/SFTPException.java | 4 +- src/com/trilead/ssh2/SFTPv3Client.java | 14 +++------ src/com/trilead/ssh2/Session.java | 8 +++--- .../trilead/ssh2/auth/AuthenticationManager.java | 28 ++++--------------- src/com/trilead/ssh2/channel/ChannelManager.java | 24 +++------------- .../trilead/ssh2/channel/RemoteAcceptThread.java | 4 +- .../ssh2/channel/RemoteX11AcceptThread.java | 4 +- src/com/trilead/ssh2/crypto/KeyMaterial.java | 4 +- src/com/trilead/ssh2/crypto/PEMDecoder.java | 14 +++------ src/com/trilead/ssh2/crypto/SimpleDERReader.java | 1 - src/com/trilead/ssh2/crypto/dh/DhExchange.java | 6 ++-- .../trilead/ssh2/crypto/dh/DhGroupExchange.java | 6 ++-- src/com/trilead/ssh2/packets/PacketKexDHReply.java | 1 - .../trilead/ssh2/packets/PacketKexDhGexGroup.java | 1 - .../trilead/ssh2/packets/PacketKexDhGexReply.java | 1 - src/com/trilead/ssh2/packets/PacketKexInit.java | 6 ++-- src/com/trilead/ssh2/packets/TypesReader.java | 4 +- src/com/trilead/ssh2/signature/DSASHA1Verify.java | 8 +++--- src/com/trilead/ssh2/signature/RSASHA1Verify.java | 6 ++-- .../trilead/ssh2/transport/ClientServerHello.java | 4 +- src/com/trilead/ssh2/transport/KexManager.java | 24 +++------------- src/com/trilead/ssh2/transport/KexState.java | 4 +- .../ssh2/transport/TransportConnection.java | 10 +++--- .../trilead/ssh2/transport/TransportManager.java | 17 +++++------- src/com/trilead/ssh2/util/TimeoutService.java | 4 +- 38 files changed, 131 insertions(+), 225 deletions(-) diff --git a/examples/Basic.java b/examples/Basic.java index 7bd1577..d36e662 100644 --- a/examples/Basic.java +++ b/examples/Basic.java @@ -1,12 +1,12 @@ +import com.trilead.ssh2.Connection; +import com.trilead.ssh2.Session; +import com.trilead.ssh2.StreamGobbler; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import com.trilead.ssh2.Connection; -import com.trilead.ssh2.Session; -import com.trilead.ssh2.StreamGobbler; - /** * This is a very basic example that shows diff --git a/examples/BasicWithHTTPProxy.java b/examples/BasicWithHTTPProxy.java index 73492db..fe45ae3 100644 --- a/examples/BasicWithHTTPProxy.java +++ b/examples/BasicWithHTTPProxy.java @@ -1,13 +1,13 @@ -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - import com.trilead.ssh2.Connection; import com.trilead.ssh2.HTTPProxyData; import com.trilead.ssh2.Session; import com.trilead.ssh2.StreamGobbler; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + /** * This is a very basic example that shows * how one can login to a machine (via a HTTP proxy) diff --git a/examples/PortForwarding.java b/examples/PortForwarding.java index dd8d4df..db53709 100644 --- a/examples/PortForwarding.java +++ b/examples/PortForwarding.java @@ -1,9 +1,9 @@ -import java.io.File; -import java.io.IOException; - import com.trilead.ssh2.Connection; import com.trilead.ssh2.LocalPortForwarder; +import java.io.File; +import java.io.IOException; + /** * This example shows how to deal with port forwardings. * diff --git a/examples/PublicKeyAuthentication.java b/examples/PublicKeyAuthentication.java index f3cb554..ccd66b0 100644 --- a/examples/PublicKeyAuthentication.java +++ b/examples/PublicKeyAuthentication.java @@ -1,13 +1,9 @@ -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - import com.trilead.ssh2.Connection; import com.trilead.ssh2.Session; import com.trilead.ssh2.StreamGobbler; +import java.io.*; + /** * This example shows how to login using * public key authentication. diff --git a/examples/SingleThreadStdoutStderr.java b/examples/SingleThreadStdoutStderr.java index 5887fa6..5e3a676 100644 --- a/examples/SingleThreadStdoutStderr.java +++ b/examples/SingleThreadStdoutStderr.java @@ -1,10 +1,10 @@ -import java.io.IOException; -import java.io.InputStream; - import com.trilead.ssh2.ChannelCondition; import com.trilead.ssh2.Connection; import com.trilead.ssh2.Session; +import java.io.IOException; +import java.io.InputStream; + /** * This example shows how to use the Session.waitForCondition * method to implement a state machine approach for diff --git a/examples/StdoutAndStderr.java b/examples/StdoutAndStderr.java index 257dc6b..d030a46 100644 --- a/examples/StdoutAndStderr.java +++ b/examples/StdoutAndStderr.java @@ -1,12 +1,12 @@ +import com.trilead.ssh2.Connection; +import com.trilead.ssh2.Session; +import com.trilead.ssh2.StreamGobbler; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import com.trilead.ssh2.Connection; -import com.trilead.ssh2.Session; -import com.trilead.ssh2.StreamGobbler; - /** * This example shows how to consume stdout/stderr output * using two StreamGobblers. This is simpler to program diff --git a/examples/SwingShell.java b/examples/SwingShell.java index 1426aca..b4e1c59 100644 --- a/examples/SwingShell.java +++ b/examples/SwingShell.java @@ -1,7 +1,7 @@ -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.FlowLayout; -import java.awt.Font; +import com.trilead.ssh2.*; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -11,24 +11,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JPasswordField; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.SwingUtilities; - -import com.trilead.ssh2.Connection; -import com.trilead.ssh2.InteractiveCallback; -import com.trilead.ssh2.KnownHosts; -import com.trilead.ssh2.ServerHostKeyVerifier; -import com.trilead.ssh2.Session; - /** * This is a very primitive SSH-2 dumb terminal (Swing based). * <p> diff --git a/examples/UsingKnownHosts.java b/examples/UsingKnownHosts.java index 708e290..0ccb3ed 100644 --- a/examples/UsingKnownHosts.java +++ b/examples/UsingKnownHosts.java @@ -1,14 +1,10 @@ -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - import com.trilead.ssh2.Connection; import com.trilead.ssh2.KnownHosts; import com.trilead.ssh2.Session; import com.trilead.ssh2.StreamGobbler; +import java.io.*; + /** * This example shows how to deal with "known_hosts" files. * diff --git a/src/com/trilead/ssh2/Connection.java b/src/com/trilead/ssh2/Connection.java index 20713bc..cb70859 100644 --- a/src/com/trilead/ssh2/Connection.java +++ b/src/com/trilead/ssh2/Connection.java @@ -1,15 +1,6 @@ package com.trilead.ssh2; -import java.io.CharArrayWriter; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.net.SocketTimeoutException; -import java.security.SecureRandom; -import java.util.Vector; - import com.trilead.ssh2.auth.AuthenticationManager; import com.trilead.ssh2.channel.ChannelManager; import com.trilead.ssh2.crypto.CryptoWishList; @@ -17,11 +8,21 @@ import com.trilead.ssh2.crypto.cipher.BlockCipherFactory; import com.trilead.ssh2.crypto.digest.MAC; import com.trilead.ssh2.log.Logger; import com.trilead.ssh2.packets.PacketIgnore; +import com.trilead.ssh2.transport.ClientServerHello; import com.trilead.ssh2.transport.KexManager; import com.trilead.ssh2.transport.TransportManager; import com.trilead.ssh2.util.TimeoutService; import com.trilead.ssh2.util.TimeoutService.TimeoutToken; +import java.io.CharArrayWriter; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.SocketTimeoutException; +import java.security.SecureRandom; +import java.util.Vector; + /** * A <code>Connection</code> is used to establish an encrypted TCP/IP * connection to a SSH-2 server. @@ -1495,4 +1496,8 @@ public class Connection cm.requestGlobalTrileadPing(); } + + public ClientServerHello getClientServerHello() { + return tm == null ? null : tm.getClientServerHello(); + } } diff --git a/src/com/trilead/ssh2/KnownHosts.java b/src/com/trilead/ssh2/KnownHosts.java index edca0a2..92c8f72 100644 --- a/src/com/trilead/ssh2/KnownHosts.java +++ b/src/com/trilead/ssh2/KnownHosts.java @@ -1,21 +1,6 @@ package com.trilead.ssh2; -import java.io.BufferedReader; -import java.io.CharArrayReader; -import java.io.CharArrayWriter; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.RandomAccessFile; -import java.io.UnsupportedEncodingException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.security.SecureRandom; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Vector; - import com.trilead.ssh2.crypto.Base64; import com.trilead.ssh2.crypto.digest.Digest; import com.trilead.ssh2.crypto.digest.HMAC; @@ -26,6 +11,14 @@ import com.trilead.ssh2.signature.DSASHA1Verify; import com.trilead.ssh2.signature.RSAPublicKey; import com.trilead.ssh2.signature.RSASHA1Verify; +import java.io.*; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.security.SecureRandom; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Vector; + /** * The <code>KnownHosts</code> class is a handy tool to verify received server hostkeys diff --git a/src/com/trilead/ssh2/LocalPortForwarder.java b/src/com/trilead/ssh2/LocalPortForwarder.java index c3183cb..c959de4 100644 --- a/src/com/trilead/ssh2/LocalPortForwarder.java +++ b/src/com/trilead/ssh2/LocalPortForwarder.java @@ -1,12 +1,12 @@ package com.trilead.ssh2; -import java.io.IOException; -import java.net.InetSocketAddress; - import com.trilead.ssh2.channel.ChannelManager; import com.trilead.ssh2.channel.LocalAcceptThread; +import java.io.IOException; +import java.net.InetSocketAddress; + /** * A <code>LocalPortForwarder</code> forwards TCP/IP connections to a local diff --git a/src/com/trilead/ssh2/LocalStreamForwarder.java b/src/com/trilead/ssh2/LocalStreamForwarder.java index a841976..6ebbdae 100644 --- a/src/com/trilead/ssh2/LocalStreamForwarder.java +++ b/src/com/trilead/ssh2/LocalStreamForwarder.java @@ -1,14 +1,14 @@ package com.trilead.ssh2; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - import com.trilead.ssh2.channel.Channel; import com.trilead.ssh2.channel.ChannelManager; import com.trilead.ssh2.channel.LocalAcceptThread; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + /** * A <code>LocalStreamForwarder</code> forwards an Input- and Outputstream diff --git a/src/com/trilead/ssh2/SCPClient.java b/src/com/trilead/ssh2/SCPClient.java index 8ea248a..a653144 100644 --- a/src/com/trilead/ssh2/SCPClient.java +++ b/src/com/trilead/ssh2/SCPClient.java @@ -1,14 +1,7 @@ package com.trilead.ssh2; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; /** * A very basic <code>SCPClient</code> that can be used to copy files from/to diff --git a/src/com/trilead/ssh2/SFTPException.java b/src/com/trilead/ssh2/SFTPException.java index f3b6d3e..6ed446f 100644 --- a/src/com/trilead/ssh2/SFTPException.java +++ b/src/com/trilead/ssh2/SFTPException.java @@ -1,10 +1,10 @@ package com.trilead.ssh2; -import java.io.IOException; - import com.trilead.ssh2.sftp.ErrorCodes; +import java.io.IOException; + /** * Used in combination with the SFTPv3Client. This exception wraps diff --git a/src/com/trilead/ssh2/SFTPv3Client.java b/src/com/trilead/ssh2/SFTPv3Client.java index be2fa1c..3c0ae0b 100644 --- a/src/com/trilead/ssh2/SFTPv3Client.java +++ b/src/com/trilead/ssh2/SFTPv3Client.java @@ -1,21 +1,17 @@ package com.trilead.ssh2; -import java.io.BufferedOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.PrintStream; -import java.nio.charset.Charset; -import java.util.HashMap; -import java.util.Vector; - import com.trilead.ssh2.packets.TypesReader; import com.trilead.ssh2.packets.TypesWriter; import com.trilead.ssh2.sftp.AttribFlags; import com.trilead.ssh2.sftp.ErrorCodes; import com.trilead.ssh2.sftp.Packet; +import java.io.*; +import java.nio.charset.Charset; +import java.util.HashMap; +import java.util.Vector; + /** * A <code>SFTPv3Client</code> represents a SFTP (protocol version 3) diff --git a/src/com/trilead/ssh2/Session.java b/src/com/trilead/ssh2/Session.java index 4784537..82cfc47 100644 --- a/src/com/trilead/ssh2/Session.java +++ b/src/com/trilead/ssh2/Session.java @@ -1,15 +1,15 @@ package com.trilead.ssh2; +import com.trilead.ssh2.channel.Channel; +import com.trilead.ssh2.channel.ChannelManager; +import com.trilead.ssh2.channel.X11ServerData; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.security.SecureRandom; -import com.trilead.ssh2.channel.Channel; -import com.trilead.ssh2.channel.ChannelManager; -import com.trilead.ssh2.channel.X11ServerData; - /** * A <code>Session</code> is a remote execution of a program. "Program" means diff --git a/src/com/trilead/ssh2/auth/AuthenticationManager.java b/src/com/trilead/ssh2/auth/AuthenticationManager.java index 894a31f..19dbb20 100644 --- a/src/com/trilead/ssh2/auth/AuthenticationManager.java +++ b/src/com/trilead/ssh2/auth/AuthenticationManager.java @@ -1,33 +1,17 @@ package com.trilead.ssh2.auth; -import java.io.IOException; -import java.security.SecureRandom; -import java.util.Vector; - import com.trilead.ssh2.InteractiveCallback; import com.trilead.ssh2.crypto.PEMDecoder; -import com.trilead.ssh2.packets.PacketServiceAccept; -import com.trilead.ssh2.packets.PacketServiceRequest; -import com.trilead.ssh2.packets.PacketUserauthBanner; -import com.trilead.ssh2.packets.PacketUserauthFailure; -import com.trilead.ssh2.packets.PacketUserauthInfoRequest; -import com.trilead.ssh2.packets.PacketUserauthInfoResponse; -import com.trilead.ssh2.packets.PacketUserauthRequestInteractive; -import com.trilead.ssh2.packets.PacketUserauthRequestNone; -import com.trilead.ssh2.packets.PacketUserauthRequestPassword; -import com.trilead.ssh2.packets.PacketUserauthRequestPublicKey; -import com.trilead.ssh2.packets.Packets; -import com.trilead.ssh2.packets.TypesWriter; -import com.trilead.ssh2.signature.DSAPrivateKey; -import com.trilead.ssh2.signature.DSASHA1Verify; -import com.trilead.ssh2.signature.DSASignature; -import com.trilead.ssh2.signature.RSAPrivateKey; -import com.trilead.ssh2.signature.RSASHA1Verify; -import com.trilead.ssh2.signature.RSASignature; +import com.trilead.ssh2.packets.*; +import com.trilead.ssh2.signature.*; import com.trilead.ssh2.transport.MessageHandler; import com.trilead.ssh2.transport.TransportManager; +import java.io.IOException; +import java.security.SecureRandom; +import java.util.Vector; + /** * AuthenticationManager. diff --git a/src/com/trilead/ssh2/channel/ChannelManager.java b/src/com/trilead/ssh2/channel/ChannelManager.java index ebd7585..3f3cd79 100644 --- a/src/com/trilead/ssh2/channel/ChannelManager.java +++ b/src/com/trilead/ssh2/channel/ChannelManager.java @@ -1,30 +1,16 @@ package com.trilead.ssh2.channel; -import java.io.IOException; -import java.util.HashMap; -import java.util.Vector; - import com.trilead.ssh2.ChannelCondition; import com.trilead.ssh2.log.Logger; -import com.trilead.ssh2.packets.PacketChannelOpenConfirmation; -import com.trilead.ssh2.packets.PacketChannelOpenFailure; -import com.trilead.ssh2.packets.PacketChannelTrileadPing; -import com.trilead.ssh2.packets.PacketGlobalCancelForwardRequest; -import com.trilead.ssh2.packets.PacketGlobalForwardRequest; -import com.trilead.ssh2.packets.PacketGlobalTrileadPing; -import com.trilead.ssh2.packets.PacketOpenDirectTCPIPChannel; -import com.trilead.ssh2.packets.PacketOpenSessionChannel; -import com.trilead.ssh2.packets.PacketSessionExecCommand; -import com.trilead.ssh2.packets.PacketSessionPtyRequest; -import com.trilead.ssh2.packets.PacketSessionStartShell; -import com.trilead.ssh2.packets.PacketSessionSubsystemRequest; -import com.trilead.ssh2.packets.PacketSessionX11Request; -import com.trilead.ssh2.packets.Packets; -import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.*; import com.trilead.ssh2.transport.MessageHandler; import com.trilead.ssh2.transport.TransportManager; +import java.io.IOException; +import java.util.HashMap; +import java.util.Vector; + /** * ChannelManager. Please read the comments in Channel.java. * <p> diff --git a/src/com/trilead/ssh2/channel/RemoteAcceptThread.java b/src/com/trilead/ssh2/channel/RemoteAcceptThread.java index 1ca9d76..2d47f6c 100644 --- a/src/com/trilead/ssh2/channel/RemoteAcceptThread.java +++ b/src/com/trilead/ssh2/channel/RemoteAcceptThread.java @@ -1,11 +1,11 @@ package com.trilead.ssh2.channel; +import com.trilead.ssh2.log.Logger; + import java.io.IOException; import java.net.Socket; -import com.trilead.ssh2.log.Logger; - /** * RemoteAcceptThread. diff --git a/src/com/trilead/ssh2/channel/RemoteX11AcceptThread.java b/src/com/trilead/ssh2/channel/RemoteX11AcceptThread.java index 8ee05a2..3e7fd29 100644 --- a/src/com/trilead/ssh2/channel/RemoteX11AcceptThread.java +++ b/src/com/trilead/ssh2/channel/RemoteX11AcceptThread.java @@ -1,13 +1,13 @@ package com.trilead.ssh2.channel; +import com.trilead.ssh2.log.Logger; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; -import com.trilead.ssh2.log.Logger; - /** * RemoteX11AcceptThread. diff --git a/src/com/trilead/ssh2/crypto/KeyMaterial.java b/src/com/trilead/ssh2/crypto/KeyMaterial.java index 5dfb55e..6e1f58b 100644 --- a/src/com/trilead/ssh2/crypto/KeyMaterial.java +++ b/src/com/trilead/ssh2/crypto/KeyMaterial.java @@ -2,10 +2,10 @@ package com.trilead.ssh2.crypto; -import java.math.BigInteger; - import com.trilead.ssh2.crypto.digest.HashForSSH2Types; +import java.math.BigInteger; + /** * Establishes key material for iv/key/mac (both directions). * diff --git a/src/com/trilead/ssh2/crypto/PEMDecoder.java b/src/com/trilead/ssh2/crypto/PEMDecoder.java index ac1b842..7b5d4e4 100644 --- a/src/com/trilead/ssh2/crypto/PEMDecoder.java +++ b/src/com/trilead/ssh2/crypto/PEMDecoder.java @@ -1,20 +1,16 @@ package com.trilead.ssh2.crypto; +import com.trilead.ssh2.crypto.cipher.*; +import com.trilead.ssh2.crypto.digest.MD5; +import com.trilead.ssh2.signature.DSAPrivateKey; +import com.trilead.ssh2.signature.RSAPrivateKey; + import java.io.BufferedReader; import java.io.CharArrayReader; import java.io.IOException; import java.math.BigInteger; -import com.trilead.ssh2.crypto.cipher.AES; -import com.trilead.ssh2.crypto.cipher.BlockCipher; -import com.trilead.ssh2.crypto.cipher.CBCMode; -import com.trilead.ssh2.crypto.cipher.DES; -import com.trilead.ssh2.crypto.cipher.DESede; -import com.trilead.ssh2.crypto.digest.MD5; -import com.trilead.ssh2.signature.DSAPrivateKey; -import com.trilead.ssh2.signature.RSAPrivateKey; - /** * PEM Support. * diff --git a/src/com/trilead/ssh2/crypto/SimpleDERReader.java b/src/com/trilead/ssh2/crypto/SimpleDERReader.java index 55c6c6a..cdf718e 100644 --- a/src/com/trilead/ssh2/crypto/SimpleDERReader.java +++ b/src/com/trilead/ssh2/crypto/SimpleDERReader.java @@ -1,7 +1,6 @@ package com.trilead.ssh2.crypto; import java.io.IOException; - import java.math.BigInteger; /** diff --git a/src/com/trilead/ssh2/crypto/dh/DhExchange.java b/src/com/trilead/ssh2/crypto/dh/DhExchange.java index 5622a72..6324011 100644 --- a/src/com/trilead/ssh2/crypto/dh/DhExchange.java +++ b/src/com/trilead/ssh2/crypto/dh/DhExchange.java @@ -1,13 +1,13 @@ package com.trilead.ssh2.crypto.dh; +import com.trilead.ssh2.crypto.digest.HashForSSH2Types; +import com.trilead.ssh2.log.Logger; + import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.security.SecureRandom; -import com.trilead.ssh2.crypto.digest.HashForSSH2Types; -import com.trilead.ssh2.log.Logger; - /** * DhExchange. diff --git a/src/com/trilead/ssh2/crypto/dh/DhGroupExchange.java b/src/com/trilead/ssh2/crypto/dh/DhGroupExchange.java index 8e798ee..5e78690 100644 --- a/src/com/trilead/ssh2/crypto/dh/DhGroupExchange.java +++ b/src/com/trilead/ssh2/crypto/dh/DhGroupExchange.java @@ -1,12 +1,12 @@ package com.trilead.ssh2.crypto.dh; -import java.math.BigInteger; -import java.security.SecureRandom; - import com.trilead.ssh2.DHGexParameters; import com.trilead.ssh2.crypto.digest.HashForSSH2Types; +import java.math.BigInteger; +import java.security.SecureRandom; + /** * DhGroupExchange. diff --git a/src/com/trilead/ssh2/packets/PacketKexDHReply.java b/src/com/trilead/ssh2/packets/PacketKexDHReply.java index 0803ff9..5cb80f9 100644 --- a/src/com/trilead/ssh2/packets/PacketKexDHReply.java +++ b/src/com/trilead/ssh2/packets/PacketKexDHReply.java @@ -1,7 +1,6 @@ package com.trilead.ssh2.packets; import java.io.IOException; - import java.math.BigInteger; /** diff --git a/src/com/trilead/ssh2/packets/PacketKexDhGexGroup.java b/src/com/trilead/ssh2/packets/PacketKexDhGexGroup.java index d531dad..6acfd68 100644 --- a/src/com/trilead/ssh2/packets/PacketKexDhGexGroup.java +++ b/src/com/trilead/ssh2/packets/PacketKexDhGexGroup.java @@ -1,7 +1,6 @@ package com.trilead.ssh2.packets; import java.io.IOException; - import java.math.BigInteger; /** diff --git a/src/com/trilead/ssh2/packets/PacketKexDhGexReply.java b/src/com/trilead/ssh2/packets/PacketKexDhGexReply.java index ae225fb..b74d113 100644 --- a/src/com/trilead/ssh2/packets/PacketKexDhGexReply.java +++ b/src/com/trilead/ssh2/packets/PacketKexDhGexReply.java @@ -2,7 +2,6 @@ package com.trilead.ssh2.packets; import java.io.IOException; - import java.math.BigInteger; /** diff --git a/src/com/trilead/ssh2/packets/PacketKexInit.java b/src/com/trilead/ssh2/packets/PacketKexInit.java index 965ef06..d80fb87 100644 --- a/src/com/trilead/ssh2/packets/PacketKexInit.java +++ b/src/com/trilead/ssh2/packets/PacketKexInit.java @@ -1,12 +1,12 @@ package com.trilead.ssh2.packets; -import java.io.IOException; -import java.security.SecureRandom; - import com.trilead.ssh2.crypto.CryptoWishList; import com.trilead.ssh2.transport.KexParameters; +import java.io.IOException; +import java.security.SecureRandom; + /** * PacketKexInit. diff --git a/src/com/trilead/ssh2/packets/TypesReader.java b/src/com/trilead/ssh2/packets/TypesReader.java index c8d73e7..8db7228 100644 --- a/src/com/trilead/ssh2/packets/TypesReader.java +++ b/src/com/trilead/ssh2/packets/TypesReader.java @@ -1,11 +1,11 @@ package com.trilead.ssh2.packets; +import com.trilead.ssh2.util.Tokenizer; + import java.io.IOException; import java.math.BigInteger; -import com.trilead.ssh2.util.Tokenizer; - /** * TypesReader. diff --git a/src/com/trilead/ssh2/signature/DSASHA1Verify.java b/src/com/trilead/ssh2/signature/DSASHA1Verify.java index c838ebd..1b34a07 100644 --- a/src/com/trilead/ssh2/signature/DSASHA1Verify.java +++ b/src/com/trilead/ssh2/signature/DSASHA1Verify.java @@ -1,15 +1,15 @@ package com.trilead.ssh2.signature; -import java.io.IOException; -import java.math.BigInteger; -import java.security.SecureRandom; - import com.trilead.ssh2.crypto.digest.SHA1; import com.trilead.ssh2.log.Logger; import com.trilead.ssh2.packets.TypesReader; import com.trilead.ssh2.packets.TypesWriter; +import java.io.IOException; +import java.math.BigInteger; +import java.security.SecureRandom; + /** * DSASHA1Verify. diff --git a/src/com/trilead/ssh2/signature/RSASHA1Verify.java b/src/com/trilead/ssh2/signature/RSASHA1Verify.java index 8a0f07a..bbca00d 100644 --- a/src/com/trilead/ssh2/signature/RSASHA1Verify.java +++ b/src/com/trilead/ssh2/signature/RSASHA1Verify.java @@ -1,15 +1,15 @@ package com.trilead.ssh2.signature; -import java.io.IOException; -import java.math.BigInteger; - import com.trilead.ssh2.crypto.SimpleDERReader; import com.trilead.ssh2.crypto.digest.SHA1; import com.trilead.ssh2.log.Logger; import com.trilead.ssh2.packets.TypesReader; import com.trilead.ssh2.packets.TypesWriter; +import java.io.IOException; +import java.math.BigInteger; + /** * RSASHA1Verify. diff --git a/src/com/trilead/ssh2/transport/ClientServerHello.java b/src/com/trilead/ssh2/transport/ClientServerHello.java index 23726f3..0a7def8 100644 --- a/src/com/trilead/ssh2/transport/ClientServerHello.java +++ b/src/com/trilead/ssh2/transport/ClientServerHello.java @@ -1,13 +1,13 @@ package com.trilead.ssh2.transport; +import com.trilead.ssh2.Connection; + import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.UnsupportedEncodingException; -import com.trilead.ssh2.Connection; - /** * ClientServerHello. * diff --git a/src/com/trilead/ssh2/transport/KexManager.java b/src/com/trilead/ssh2/transport/KexManager.java index 686e6cd..d3160bb 100644 --- a/src/com/trilead/ssh2/transport/KexManager.java +++ b/src/com/trilead/ssh2/transport/KexManager.java @@ -1,9 +1,6 @@ package com.trilead.ssh2.transport; -import java.io.IOException; -import java.security.SecureRandom; - import com.trilead.ssh2.ConnectionInfo; import com.trilead.ssh2.DHGexParameters; import com.trilead.ssh2.ServerHostKeyVerifier; @@ -15,22 +12,11 @@ import com.trilead.ssh2.crypto.dh.DhExchange; import com.trilead.ssh2.crypto.dh.DhGroupExchange; import com.trilead.ssh2.crypto.digest.MAC; import com.trilead.ssh2.log.Logger; -import com.trilead.ssh2.packets.PacketKexDHInit; -import com.trilead.ssh2.packets.PacketKexDHReply; -import com.trilead.ssh2.packets.PacketKexDhGexGroup; -import com.trilead.ssh2.packets.PacketKexDhGexInit; -import com.trilead.ssh2.packets.PacketKexDhGexReply; -import com.trilead.ssh2.packets.PacketKexDhGexRequest; -import com.trilead.ssh2.packets.PacketKexDhGexRequestOld; -import com.trilead.ssh2.packets.PacketKexInit; -import com.trilead.ssh2.packets.PacketNewKeys; -import com.trilead.ssh2.packets.Packets; -import com.trilead.ssh2.signature.DSAPublicKey; -import com.trilead.ssh2.signature.DSASHA1Verify; -import com.trilead.ssh2.signature.DSASignature; -import com.trilead.ssh2.signature.RSAPublicKey; -import com.trilead.ssh2.signature.RSASHA1Verify; -import com.trilead.ssh2.signature.RSASignature; +import com.trilead.ssh2.packets.*; +import com.trilead.ssh2.signature.*; + +import java.io.IOException; +import java.security.SecureRandom; /** diff --git a/src/com/trilead/ssh2/transport/KexState.java b/src/com/trilead/ssh2/transport/KexState.java index dabf450..7fb6fc9 100644 --- a/src/com/trilead/ssh2/transport/KexState.java +++ b/src/com/trilead/ssh2/transport/KexState.java @@ -1,13 +1,13 @@ package com.trilead.ssh2.transport; -import java.math.BigInteger; - import com.trilead.ssh2.DHGexParameters; import com.trilead.ssh2.crypto.dh.DhExchange; import com.trilead.ssh2.crypto.dh.DhGroupExchange; import com.trilead.ssh2.packets.PacketKexInit; +import java.math.BigInteger; + /** * KexState. * diff --git a/src/com/trilead/ssh2/transport/TransportConnection.java b/src/com/trilead/ssh2/transport/TransportConnection.java index a193503..8a8e0fa 100644 --- a/src/com/trilead/ssh2/transport/TransportConnection.java +++ b/src/com/trilead/ssh2/transport/TransportConnection.java @@ -1,11 +1,6 @@ package com.trilead.ssh2.transport; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.security.SecureRandom; - import com.trilead.ssh2.crypto.cipher.BlockCipher; import com.trilead.ssh2.crypto.cipher.CipherInputStream; import com.trilead.ssh2.crypto.cipher.CipherOutputStream; @@ -14,6 +9,11 @@ import com.trilead.ssh2.crypto.digest.MAC; import com.trilead.ssh2.log.Logger; import com.trilead.ssh2.packets.Packets; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.SecureRandom; + /** * TransportConnection. diff --git a/src/com/trilead/ssh2/transport/TransportManager.java b/src/com/trilead/ssh2/transport/TransportManager.java index ab73071..63e0c1a 100644 --- a/src/com/trilead/ssh2/transport/TransportManager.java +++ b/src/com/trilead/ssh2/transport/TransportManager.java @@ -1,16 +1,6 @@ package com.trilead.ssh2.transport; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.UnknownHostException; -import java.security.SecureRandom; -import java.util.Vector; - import com.trilead.ssh2.ConnectionInfo; import com.trilead.ssh2.ConnectionMonitor; import com.trilead.ssh2.DHGexParameters; @@ -28,6 +18,13 @@ import com.trilead.ssh2.packets.Packets; import com.trilead.ssh2.packets.TypesReader; import com.trilead.ssh2.util.Tokenizer; +import java.io.IOException; +import java.net.InetAddress; +import java.net.Socket; +import java.net.UnknownHostException; +import java.security.SecureRandom; +import java.util.Vector; + /* * Yes, the "standard" is a big mess. On one side, the say that arbitary channel diff --git a/src/com/trilead/ssh2/util/TimeoutService.java b/src/com/trilead/ssh2/util/TimeoutService.java index b09ed07..f21852f 100644 --- a/src/com/trilead/ssh2/util/TimeoutService.java +++ b/src/com/trilead/ssh2/util/TimeoutService.java @@ -1,13 +1,13 @@ package com.trilead.ssh2.util; +import com.trilead.ssh2.log.Logger; + import java.io.PrintWriter; import java.io.StringWriter; import java.util.Collections; import java.util.LinkedList; -import com.trilead.ssh2.log.Logger; - /** * TimeoutService (beta). Here you can register a timeout. -- 1.6.6.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
