Remove deprecated calls

Author: kruton

build.gradle.kts

@@ -40,7 +40,6 @@ val gitHubUrl = "https://github.com/connectbot/sshlib"
 apply(from = "$rootDir/config/quality.gradle.kts")
 
 dependencies {
-    implementation("com.jcraft:jzlib:1.1.3")
     implementation("org.connectbot:simplesocks:1.0.1")
     implementation("com.google.crypto.tink:tink:1.19.0") {
         isTransitive = false

src/main/java/com/trilead/ssh2/SFTPv3Client.java

@@ -7,8 +7,10 @@
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Vector;
+import java.util.List;
+import java.util.Map;
 
 import com.trilead.ssh2.packets.TypesReader;
 import com.trilead.ssh2.packets.TypesWriter;
@@ -89,7 +91,7 @@ public class SFTPv3Client
 	OutputStream os;
 
 	int protocol_version = 0;
-	HashMap server_extensions = new HashMap();
+	Map<String, byte[]> server_extensions = new HashMap<>();
 
 	int next_request_id = 1000;
 
@@ -317,30 +319,30 @@ private SFTPv3FileAttributes readAttrs(TypesReader tr) throws IOException
 		{
 			if (debug != null)
 				debug.println("SSH_FILEXFER_ATTR_SIZE");
-			fa.size = new Long(tr.readUINT64());
+			fa.size = Long.valueOf(tr.readUINT64());
 		}
 
 		if ((flags & AttribFlags.SSH_FILEXFER_ATTR_V3_UIDGID) != 0)
 		{
 			if (debug != null)
 				debug.println("SSH_FILEXFER_ATTR_V3_UIDGID");
-			fa.uid = new Integer(tr.readUINT32());
-			fa.gid = new Integer(tr.readUINT32());
+			fa.uid = Integer.valueOf(tr.readUINT32());
+			fa.gid = Integer.valueOf(tr.readUINT32());
 		}
 
 		if ((flags & AttribFlags.SSH_FILEXFER_ATTR_PERMISSIONS) != 0)
 		{
 			if (debug != null)
 				debug.println("SSH_FILEXFER_ATTR_PERMISSIONS");
-			fa.permissions = new Integer(tr.readUINT32());
+			fa.permissions = Integer.valueOf(tr.readUINT32());
 		}
 
 		if ((flags & AttribFlags.SSH_FILEXFER_ATTR_V3_ACMODTIME) != 0)
 		{
 			if (debug != null)
 				debug.println("SSH_FILEXFER_ATTR_V3_ACMODTIME");
-			fa.atime = new Long(((long) tr.readUINT32()) & 0xffffffffl);
-			fa.mtime = new Long(((long) tr.readUINT32()) & 0xffffffffl);
+			fa.atime = Long.valueOf(((long) tr.readUINT32()) & 0xffffffffl);
+			fa.mtime = Long.valueOf(((long) tr.readUINT32()) & 0xffffffffl);
 
 		}
 
@@ -723,9 +725,9 @@ public String canonicalPath(String path) throws IOException
 		throw new SFTPException(tr.readString(), errorCode);
 	}
 
-	private final Vector scanDirectory(byte[] handle) throws IOException
+	private final List<SFTPv3DirectoryEntry> scanDirectory(byte[] handle) throws IOException
 	{
-		Vector files = new Vector();
+		List<SFTPv3DirectoryEntry> files = new ArrayList<>();
 
 		while (true)
 		{
@@ -776,7 +778,7 @@ private final Vector scanDirectory(byte[] handle) throws IOException
 					dirEnt.longEntry = tr.readString(charsetName);
 
 					dirEnt.attributes = readAttrs(tr);
-					files.addElement(dirEnt);
+					files.add(dirEnt);
 
 					if (debug != null)
 						debug.println("File: '" + dirEnt.filename + "'");
@@ -942,13 +944,13 @@ public void close()
 	 * List the contents of a directory.
 	 *
 	 * @param dirName See the {@link SFTPv3Client comment} for the class for more details.
-	 * @return A Vector containing {@link SFTPv3DirectoryEntry} objects.
+	 * @return A List containing {@link SFTPv3DirectoryEntry} objects.
 	 * @throws IOException on error
 	 */
-	public Vector ls(String dirName) throws IOException
+	public List<SFTPv3DirectoryEntry> ls(String dirName) throws IOException
 	{
 		byte[] handle = openDirectory(dirName);
-		Vector result = scanDirectory(handle);
+		List<SFTPv3DirectoryEntry> result = scanDirectory(handle);
 		closeHandle(handle);
 		return result;
 	}

src/main/java/com/trilead/ssh2/auth/AuthenticationManager.java

@@ -12,8 +12,9 @@
 import java.security.interfaces.DSAPublicKey;
 import java.security.interfaces.ECPublicKey;
 import java.security.interfaces.RSAPublicKey;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
-import java.util.Vector;
 
 import com.trilead.ssh2.InteractiveCallback;
 import com.trilead.ssh2.crypto.PEMDecoder;
@@ -48,7 +49,7 @@ public class AuthenticationManager implements MessageHandler
 {
 	TransportManager tm;
 
-	Vector packets = new Vector();
+	List<byte[]> packets = new ArrayList<>();
 	boolean connectionClosed = false;
 
 	String banner;
@@ -94,9 +95,8 @@ byte[] deQueue() throws IOException
 				{
 				}
 			}
-			/* This sequence works with J2ME */
-			byte[] res = (byte[]) packets.firstElement();
-			packets.removeElementAt(0);
+			byte[] res = packets.get(0);
+			packets.remove(0);
 			return res;
 		}
 	}
@@ -462,7 +462,7 @@ public void handleMessage(byte[] msg, int msglen) throws IOException
 			{
 				byte[] tmp = new byte[msglen];
 				System.arraycopy(msg, 0, tmp, 0, msglen);
-				packets.addElement(tmp);
+				packets.add(tmp);
 			}
 
 			packets.notifyAll();

src/main/java/com/trilead/ssh2/compression/Zlib.java

@@ -29,8 +29,8 @@
 
 package com.trilead.ssh2.compression;
 
-import com.jcraft.jzlib.JZlib;
-import com.jcraft.jzlib.ZStream;
+import java.util.zip.Deflater;
+import java.util.zip.Inflater;
 
 /**
  * @author Kenny Root
@@ -40,19 +40,16 @@ public class Zlib implements ICompressor {
 	static private final int DEFAULT_BUF_SIZE = 4096;
 	static private final int LEVEL = 5;
 
-	private ZStream deflate;
+	private Deflater deflate;
 	private byte[] deflate_tmpbuf;
 
-	private ZStream inflate;
+	private Inflater inflate;
 	private byte[] inflate_tmpbuf;
 	private byte[] inflated_buf;
 
 	public Zlib() {
-		deflate = new ZStream();
-		inflate = new ZStream();
-
-		deflate.deflateInit(LEVEL);
-		inflate.inflateInit();
+		deflate = new Deflater(LEVEL);
+		inflate = new Inflater();
 
 		deflate_tmpbuf = new byte[DEFAULT_BUF_SIZE];
 		inflate_tmpbuf = new byte[DEFAULT_BUF_SIZE];
@@ -68,28 +65,22 @@ public int getBufferSize() {
 	}
 
 	public int compress(byte[] buf, int start, int len, byte[] output) {
-		deflate.next_in = buf;
-		deflate.next_in_index = start;
-		deflate.avail_in = len - start;
+		deflate.setInput(buf, start, len - start);
 
 		if ((buf.length + 1024) > deflate_tmpbuf.length) {
 			deflate_tmpbuf = new byte[buf.length + 1024];
 		}
 
-		deflate.next_out = deflate_tmpbuf;
-		deflate.next_out_index = 0;
-		deflate.avail_out = output.length;
+		int outputlen = deflate.deflate(deflate_tmpbuf, 0, output.length, Deflater.SYNC_FLUSH);
 
-		if (deflate.deflate(JZlib.Z_PARTIAL_FLUSH) != JZlib.Z_OK) {
+		if (deflate.getAdler() == 0) {
 			System.err.println("compress: compression failure");
 		}
 
-		if (deflate.avail_in > 0) {
+		if (!deflate.finished() && deflate.getTotalIn() < len - start) {
 			System.err.println("compress: deflated data too large");
 		}
 
-		int outputlen = output.length - deflate.avail_out;
-
 		System.arraycopy(deflate_tmpbuf, 0, output, 0, outputlen);
 
 		return outputlen;
@@ -98,45 +89,48 @@ public int compress(byte[] buf, int start, int len, byte[] output) {
 	public byte[] uncompress(byte[] buffer, int start, int[] length) {
 		int inflated_end = 0;
 
-		inflate.next_in = buffer;
-		inflate.next_in_index = start;
-		inflate.avail_in = length[0];
-
-		while (true) {
-			inflate.next_out = inflate_tmpbuf;
-			inflate.next_out_index = 0;
-			inflate.avail_out = DEFAULT_BUF_SIZE;
-			int status = inflate.inflate(JZlib.Z_PARTIAL_FLUSH);
-			switch (status) {
-			case JZlib.Z_OK:
-				if (inflated_buf.length < inflated_end + DEFAULT_BUF_SIZE
-						- inflate.avail_out) {
-					byte[] foo = new byte[inflated_end + DEFAULT_BUF_SIZE
-							- inflate.avail_out];
-					System.arraycopy(inflated_buf, 0, foo, 0, inflated_end);
-					inflated_buf = foo;
-				}
-				System.arraycopy(inflate_tmpbuf, 0, inflated_buf, inflated_end,
-						DEFAULT_BUF_SIZE - inflate.avail_out);
-				inflated_end += (DEFAULT_BUF_SIZE - inflate.avail_out);
-				length[0] = inflated_end;
-				break;
-			case JZlib.Z_BUF_ERROR:
-				if (inflated_end > buffer.length - start) {
-					byte[] foo = new byte[inflated_end + start];
-					System.arraycopy(buffer, 0, foo, 0, start);
-					System.arraycopy(inflated_buf, 0, foo, start, inflated_end);
-					buffer = foo;
-				} else {
-					System.arraycopy(inflated_buf, 0, buffer, start,
-							inflated_end);
+		inflate.setInput(buffer, start, length[0]);
+
+		while (!inflate.needsInput()) {
+			try {
+				int decompressed = inflate.inflate(inflate_tmpbuf, 0, DEFAULT_BUF_SIZE);
+
+				if (decompressed > 0) {
+					if (inflated_buf.length < inflated_end + decompressed) {
+						byte[] foo = new byte[inflated_end + decompressed];
+						System.arraycopy(inflated_buf, 0, foo, 0, inflated_end);
+						inflated_buf = foo;
+					}
+					System.arraycopy(inflate_tmpbuf, 0, inflated_buf, inflated_end, decompressed);
+					inflated_end += decompressed;
+					length[0] = inflated_end;
+				} else if (decompressed == 0) {
+					if (inflated_end > buffer.length - start) {
+						byte[] foo = new byte[inflated_end + start];
+						System.arraycopy(buffer, 0, foo, 0, start);
+						System.arraycopy(inflated_buf, 0, foo, start, inflated_end);
+						buffer = foo;
+					} else {
+						System.arraycopy(inflated_buf, 0, buffer, start, inflated_end);
+					}
+					length[0] = inflated_end;
+					return buffer;
 				}
-				length[0] = inflated_end;
-				return buffer;
-			default:
-				System.err.println("uncompress: inflate returnd " + status);
+			} catch (java.util.zip.DataFormatException e) {
+				System.err.println("uncompress: inflate error: " + e.getMessage());
 				return null;
 			}
 		}
+
+		if (inflated_end > buffer.length - start) {
+			byte[] foo = new byte[inflated_end + start];
+			System.arraycopy(buffer, 0, foo, 0, start);
+			System.arraycopy(inflated_buf, 0, foo, start, inflated_end);
+			buffer = foo;
+		} else {
+			System.arraycopy(inflated_buf, 0, buffer, start, inflated_end);
+		}
+		length[0] = inflated_end;
+		return buffer;
 	}
 }

src/main/java/com/trilead/ssh2/crypto/cipher/BlockCipherFactory.java

@@ -68,9 +68,9 @@ public static BlockCipher createCipher(String type, boolean encrypt, byte[] key,
 		try
 		{
 			CipherEntry ce = getEntry(type);
-			Class cc = Class.forName(ce.cipherClass);
-			Constructor<BlockCipher> constructor = cc.getConstructor();
-			BlockCipher bc = constructor.newInstance();
+			Class<?> cc = Class.forName(ce.cipherClass);
+			Constructor<?> constructor = cc.getConstructor();
+			BlockCipher bc = (BlockCipher) constructor.newInstance();
 			bc.init(encrypt, key, iv);
 			return bc;
 		}

src/main/java/com/trilead/ssh2/crypto/keys/Ed25519Provider.java

@@ -21,7 +21,7 @@ public class Ed25519Provider extends Provider {
 	private static boolean sInitialized = false;
 
 	public Ed25519Provider() {
-		super(NAME, 1.0, "Not for use elsewhere");
+		super(NAME, "1.0", "Not for use elsewhere");
 		AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
 			setup();
 			return null;

src/main/java/com/trilead/ssh2/util/TimeoutService.java

@@ -27,7 +27,7 @@ public class TimeoutService
 	/**
 	 * A token that represents a timeout request.
 	 */
-	public static class TimeoutToken implements Comparable
+	public static class TimeoutToken implements Comparable<TimeoutToken>
 	{
 		private long runTime;
 		private Runnable handler;
@@ -38,9 +38,8 @@ private TimeoutToken(long runTime, Runnable handler)
 			this.handler = handler;
 		}
 
-		public int compareTo(Object o)
+		public int compareTo(TimeoutToken t)
 		{
-			TimeoutToken t = (TimeoutToken) o;
 			if (runTime > t.runTime)
 				return 1;
 			if (runTime == t.runTime)
@@ -105,7 +104,7 @@ public void run()
 	}
 
 	/* The list object is also used for locking purposes */
-	private static final LinkedList todolist = new LinkedList();
+	private static final LinkedList<TimeoutToken> todolist = new LinkedList<>();
 
 	private static Thread timeoutThread = null;
 

src/test/java/com/trilead/ssh2/AsyncSSHCompatibilityTest.java

@@ -54,7 +54,7 @@ public class AsyncSSHCompatibilityTest {
 	@NotNull
 	@Contract("_ -> new")
 	private Connection withServer(@NotNull GenericContainer container) {
-		return new Connection(container.getContainerIpAddress(), container.getMappedPort(8022));
+		return new Connection(container.getHost(), container.getMappedPort(8022));
 	}
 
 	private ConnectionInfo assertCanPasswordAuthenticate(GenericContainer server) throws IOException {

src/test/java/com/trilead/ssh2/DropbearCompatibilityTest.java

@@ -53,11 +53,11 @@ public class DropbearCompatibilityTest {
 	@NotNull
 	@Contract("_ -> new")
 	private Connection withServer(@NotNull GenericContainer container) {
-		return new Connection(container.getContainerIpAddress(), container.getMappedPort(22));
+		return new Connection(container.getHost(), container.getMappedPort(22));
 	}
 
 	private static GenericContainer getBaseContainer() {
-		return new GenericContainer(baseImage)
+		return new GenericContainer<>(baseImage)
 				.withExposedPorts(22)
 				.withLogConsumer(logConsumer)
 				.waitingFor(new LogMessageWaitStrategy()

src/test/java/com/trilead/ssh2/OpenSSHCompatibilityTest.java

@@ -48,7 +48,7 @@ public class OpenSSHCompatibilityTest {
 	@NotNull
 	@Contract("_ -> new")
 	private Connection withServer(@NotNull GenericContainer<?> container) {
-		return new Connection(container.getContainerIpAddress(), container.getMappedPort(22));
+		return new Connection(container.getHost(), container.getMappedPort(22));
 	}
 
 	private static GenericContainer<?> getBaseContainer() {