Merge upstream master branch

Author: hagau

gradle.properties

@@ -1,4 +1,4 @@
-#Sun, 12 Feb 2017 15:38:57 -0800
+#Sun, 19 Aug 2018 00:26:58 +0200
 # Project-wide Gradle settings.
 
 # IDE (e.g. Android Studio) users:
@@ -18,12 +18,12 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-version=2.2.6-SNAPSHOT
+version=2.2.6
 group=org.connectbot
 description=SSH library used in the ConnectBot app
 
 bintrayUser=dummyUser
 bintrayApiKey=dummyApiKey
 
-officialJdk=oraclejdk7
+officialJdk=oraclejdk9
 gitHubUrl=https\://github.com/connectbot/sshlib

sshlib/build.gradle

@@ -24,3 +24,8 @@ dependencies {
     testCompile 'commons-io:commons-io:2.6'
     testCompile 'commons-codec:commons-codec:1.11'
 }
+
+compileJava {
+    sourceCompatibility = '1.7'
+    targetCompatibility = '1.7'
+}

sshlib/src/main/java/com/trilead/ssh2/Connection.java

@@ -17,6 +17,7 @@
 import com.trilead.ssh2.crypto.CryptoWishList;
 import com.trilead.ssh2.crypto.cipher.BlockCipherFactory;
 import com.trilead.ssh2.crypto.digest.MAC;
+import com.trilead.ssh2.crypto.digest.MACs;
 import com.trilead.ssh2.log.Logger;
 import com.trilead.ssh2.packets.PacketIgnore;
 import com.trilead.ssh2.transport.KexManager;
@@ -74,7 +75,7 @@ public static synchronized String[] getAvailableCiphers()
 	 */
 	public static synchronized String[] getAvailableMACs()
 	{
-		return MAC.getMacList();
+		return MACs.getMacList();
 	}
 
 	/**
@@ -1273,7 +1274,7 @@ public synchronized void setClient2ServerMACs(String[] macs)
 		if ((macs == null) || (macs.length == 0))
 			throw new IllegalArgumentException();
 		macs = removeDuplicates(macs);
-		MAC.checkMacList(macs);
+		MACs.checkMacList(macs);
 		cryptoWishList.c2s_mac_algos = macs;
 	}
 
@@ -1319,7 +1320,7 @@ public synchronized void setServer2ClientMACs(String[] macs)
 			throw new IllegalArgumentException();
 
 		macs = removeDuplicates(macs);
-		MAC.checkMacList(macs);
+		MACs.checkMacList(macs);
 		cryptoWishList.s2c_mac_algos = macs;
 	}
 

sshlib/src/main/java/com/trilead/ssh2/crypto/CryptoWishList.java

@@ -3,7 +3,7 @@
 
 import com.trilead.ssh2.compression.CompressionFactory;
 import com.trilead.ssh2.crypto.cipher.BlockCipherFactory;
-import com.trilead.ssh2.crypto.digest.MAC;
+import com.trilead.ssh2.crypto.digest.MACs;
 import com.trilead.ssh2.transport.KexManager;
 
 
@@ -19,8 +19,8 @@ public class CryptoWishList
 	public String[] serverHostKeyAlgorithms = KexManager.getDefaultServerHostkeyAlgorithmList();
 	public String[] c2s_enc_algos = BlockCipherFactory.getDefaultCipherList();
 	public String[] s2c_enc_algos = BlockCipherFactory.getDefaultCipherList();
-	public String[] c2s_mac_algos = MAC.getMacList();
-	public String[] s2c_mac_algos = MAC.getMacList();
+	public String[] c2s_mac_algos = MACs.getMacList();
+	public String[] s2c_mac_algos = MACs.getMacList();
 	public String[] c2s_comp_algos = CompressionFactory.getDefaultCompressorList();
 	public String[] s2c_comp_algos = CompressionFactory.getDefaultCompressorList();
 }

sshlib/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java

@@ -29,7 +29,6 @@
 
 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.packets.TypesReader;
@@ -60,7 +59,7 @@ public class PEMDecoder
 		'o', 'p', 'e', 'n', 's', 's', 'h', '-', 'k', 'e', 'y', '-', 'v', '1', '\0',
 	};
 
-	private static final int hexToInt(char c)
+	private static int hexToInt(char c)
 	{
 		if ((c >= 'a') && (c <= 'f'))
 		{
@@ -276,41 +275,36 @@ public static final PEMStructure parsePEM(char[] pem) throws IOException
 		return ps;
 	}
 
-	private static final byte[] decryptData(byte[] data, byte[] pw, byte[] salt, int rounds, String algo) throws IOException
+	private static byte[] decryptData(byte[] data, byte[] pw, byte[] salt, int rounds, String algo) throws IOException
 	{
-		BlockCipher rawCipher;
 		BlockCipher bc;
 		int keySize;
 
 		String algoLower = algo.toLowerCase(Locale.US);
 		if (algoLower.equals("des-ede3-cbc"))
 		{
-			rawCipher = new DESede();
+			bc = new DESede.CBC();
 			keySize = 24;
-			bc = new CBCMode(rawCipher, salt, false);
 		}
 		else if (algoLower.equals("des-cbc"))
 		{
-			rawCipher = new DES();
+			bc = new DES.CBC();
 			keySize = 8;
-			bc = new CBCMode(rawCipher, salt, false);
 		}
 		else if (algoLower.equals("aes-128-cbc") || algoLower.equals("aes128-cbc"))
 		{
-			rawCipher = new AES();
+			bc = new AES.CBC();
 			keySize = 16;
-			bc = new CBCMode(rawCipher, salt, false);
 		}
 		else if (algoLower.equals("aes-192-cbc") || algoLower.equals("aes192-cbc"))
 		{
-			rawCipher = new AES();
+			bc = new AES.CBC();
 			keySize = 24;
 		}
 		else if (algoLower.equals("aes-256-cbc") || algoLower.equals("aes256-cbc"))
 		{
-			rawCipher = new AES();
+			bc = new AES.CBC();
 			keySize = 32;
-			bc = new CBCMode(rawCipher, salt, false);
 		}
 		else
 		{
@@ -319,13 +313,12 @@ else if (algoLower.equals("aes-256-cbc") || algoLower.equals("aes256-cbc"))
 
 		if (rounds == -1)
 		{
-			rawCipher.init(false, generateKeyFromPasswordSaltWithMD5(pw, salt, keySize));
-			bc = new CBCMode(rawCipher, salt, false);
+			bc.init(false, generateKeyFromPasswordSaltWithMD5(pw, salt, keySize), salt);
 		}
 		else
 		{
 			byte[] key = new byte[keySize];
-			byte[] iv = new byte[rawCipher.getBlockSize()];
+			byte[] iv = new byte[bc.getBlockSize()];
 
 			byte[] keyAndIV = new byte[key.length + iv.length];
 
@@ -334,8 +327,7 @@ else if (algoLower.equals("aes-256-cbc") || algoLower.equals("aes256-cbc"))
 			System.arraycopy(keyAndIV, 0, key, 0, key.length);
 			System.arraycopy(keyAndIV, key.length, iv, 0, iv.length);
 
-			rawCipher.init(false, key);
-			bc = new CBCMode(rawCipher, iv, false);
+			bc.init(false, key, iv);
 		}
 
 
@@ -360,7 +352,7 @@ else if (algoLower.equals("aes-256-cbc") || algoLower.equals("aes256-cbc"))
 		}
 	}
 
-	private static final void decryptPEM(PEMStructure ps, byte[] pw) throws IOException
+	private static void decryptPEM(PEMStructure ps, byte[] pw) throws IOException
 	{
 		if (ps.dekInfo == null)
 			throw new IOException("Broken PEM, no mode and salt given, but encryption enabled");