Remove J2ME compatibility layer for keys

Use JCE instead of the DIY crypto library that is in Trilead. This was
apparently for J2ME devices. Well, I'm sorry, J2ME devices, you're dead
to me.

8 files changed, 217 insertions, 512 deletions

diff --git a/lib/src/main/java/com/trilead/ssh2/signature/DSAPrivateKey.java b/lib/src/main/java/com/trilead/ssh2/signature/DSAPrivateKey.java
deleted file mode 100644
index d2a63ae..0000000
--- a/lib/src/main/java/com/trilead/ssh2/signature/DSAPrivateKey.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.trilead.ssh2.signature;

-

-import java.math.BigInteger;

-

-/**

- * DSAPrivateKey.

- * 

- * @author Christian Plattner, plattner@trilead.com

- * @version $Id: DSAPrivateKey.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $

- */

-public class DSAPrivateKey

-{

-	private BigInteger p;

-	private BigInteger q;

-	private BigInteger g;

-	private BigInteger x;

-	private BigInteger y;

-

-	public DSAPrivateKey(BigInteger p, BigInteger q, BigInteger g,

-			BigInteger y, BigInteger x)

-	{

-		this.p = p;

-		this.q = q;

-		this.g = g;

-		this.y = y;

-		this.x = x;

-	}

-

-	public BigInteger getP()

-	{

-		return p;

-	}

-

-	public BigInteger getQ()

-	{

-		return q;

-	}

-	

-	public BigInteger getG()

-	{

-		return g;

-	}

-

-	public BigInteger getY()

-	{

-		return y;

-	}

-	

-	public BigInteger getX()

-	{

-		return x;

-	}

-	

-	public DSAPublicKey getPublicKey()

-	{

-		return new DSAPublicKey(p, q, g, y);

-	}

-}
\ No newline at end of file
diff --git a/lib/src/main/java/com/trilead/ssh2/signature/DSAPublicKey.java b/lib/src/main/java/com/trilead/ssh2/signature/DSAPublicKey.java
deleted file mode 100644
index f8351ff..0000000
--- a/lib/src/main/java/com/trilead/ssh2/signature/DSAPublicKey.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.trilead.ssh2.signature;

-

-import java.math.BigInteger;

-

-/**

- * DSAPublicKey.

- * 

- * @author Christian Plattner, plattner@trilead.com

- * @version $Id: DSAPublicKey.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $

- */

-public class DSAPublicKey

-{

-	private BigInteger p;

-	private BigInteger q;

-	private BigInteger g;

-	private BigInteger y;

-

-	public DSAPublicKey(BigInteger p, BigInteger q, BigInteger g, BigInteger y)

-	{

-		this.p = p;

-		this.q = q;

-		this.g = g;

-		this.y = y;

-	}

-

-	public BigInteger getP()

-	{

-		return p;

-	}

-

-	public BigInteger getQ()

-	{

-		return q;

-	}

-

-	public BigInteger getG()

-	{

-		return g;

-	}

-

-	public BigInteger getY()

-	{

-		return y;

-	}

-}
\ No newline at end of file
diff --git a/lib/src/main/java/com/trilead/ssh2/signature/DSASHA1Verify.java b/lib/src/main/java/com/trilead/ssh2/signature/DSASHA1Verify.java
index c838ebd..357d66e 100644
--- a/lib/src/main/java/com/trilead/ssh2/signature/DSASHA1Verify.java
+++ b/lib/src/main/java/com/trilead/ssh2/signature/DSASHA1Verify.java
@@ -3,9 +3,19 @@ package com.trilead.ssh2.signature;
 

 import java.io.IOException;

 import java.math.BigInteger;

+import java.security.InvalidKeyException;

+import java.security.KeyFactory;

+import java.security.NoSuchAlgorithmException;

 import java.security.SecureRandom;

+import java.security.Signature;

+import java.security.SignatureException;

+import java.security.interfaces.DSAParams;

+import java.security.interfaces.DSAPrivateKey;

+import java.security.interfaces.DSAPublicKey;

+import java.security.spec.DSAPublicKeySpec;

+import java.security.spec.InvalidKeySpecException;

+import java.security.spec.KeySpec;

 

-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;

@@ -38,7 +48,20 @@ public class DSASHA1Verify
 		if (tr.remain() != 0)

 			throw new IOException("Padding in DSA public key!");

 

-		return new DSAPublicKey(p, q, g, y);

+		try {

+			KeyFactory kf = KeyFactory.getInstance("DSA");

+

+			KeySpec ks = new DSAPublicKeySpec(y, p, q, g);

+			return (DSAPublicKey) kf.generatePublic(ks);

+		} catch (NoSuchAlgorithmException e) {

+			IOException ex = new IOException();

+			ex.initCause(e);

+			throw ex;

+		} catch (InvalidKeySpecException e) {

+			IOException ex = new IOException();

+			ex.initCause(e);

+			throw ex;

+		}

 	}

 

 	public static byte[] encodeSSHDSAPublicKey(DSAPublicKey pk) throws IOException

@@ -46,25 +69,47 @@ public class DSASHA1Verify
 		TypesWriter tw = new TypesWriter();

 

 		tw.writeString("ssh-dss");

-		tw.writeMPInt(pk.getP());

-		tw.writeMPInt(pk.getQ());

-		tw.writeMPInt(pk.getG());

+

+		DSAParams params = pk.getParams();

+		tw.writeMPInt(params.getP());

+		tw.writeMPInt(params.getQ());

+		tw.writeMPInt(params.getG());

 		tw.writeMPInt(pk.getY());

 

 		return tw.getBytes();

 	}

 

-	public static byte[] encodeSSHDSASignature(DSASignature ds)

+	/**

+	 * Convert from Java's signature ASN.1 encoding to the SSH spec.

+	 * <p>

+	 * Java ASN.1 encoding:

+	 * <pre>

+	 * SEQUENCE ::= {

+	 *    r INTEGER,

+	 *    s INTEGER

+	 * }

+	 * </pre>

+	 */

+	public static byte[] encodeSSHDSASignature(byte[] ds)

 	{

 		TypesWriter tw = new TypesWriter();

 

 		tw.writeString("ssh-dss");

 

-		byte[] r = ds.getR().toByteArray();

-		byte[] s = ds.getS().toByteArray();

+		int len, index;

 

-		byte[] a40 = new byte[40];

+		index = 3;

+		len = ds[index++] & 0xff;

+		byte[] r = new byte[len];

+		System.arraycopy(ds, index, r, 0, r.length);

 

+		index = index + len + 1;

+		len = ds[index++] & 0xff;

+		byte[] s = new byte[len];

+		System.arraycopy(ds, index, s, 0, s.length);

+

+		byte[] a40 = new byte[40];

+
 		/* Patch (unsigned) r and s into the target array. */

 

 		int r_copylen = (r.length < 20) ? r.length : 20;

@@ -78,22 +123,21 @@ public class DSASHA1Verify
 		return tw.getBytes();

 	}

 

-	public static DSASignature decodeSSHDSASignature(byte[] sig) throws IOException

+	public static byte[] decodeSSHDSASignature(byte[] sig) throws IOException

 	{

 		byte[] rsArray = null;

 		

 		if (sig.length == 40)

 		{

 			/* OK, another broken SSH server. */

-			rsArray = sig;	

+			rsArray = sig;

 		}

 		else

 		{

-			/* Hopefully a server obeing the standard... */

+			/* Hopefully a server obeying the standard... */

 			TypesReader tr = new TypesReader(sig);

 

 			String sig_format = tr.readString();

-

 			if (sig_format.equals("ssh-dss") == false)

 				throw new IOException("Peer sent wrong signature format");

 

@@ -106,105 +150,106 @@ public class DSASHA1Verify
 				throw new IOException("Padding in DSA signature!");

 		}

 

-		/* Remember, s and r are unsigned ints. */

-

-		byte[] tmp = new byte[20];

-

-		System.arraycopy(rsArray, 0, tmp, 0, 20);

-		BigInteger r = new BigInteger(1, tmp);

-

-		System.arraycopy(rsArray, 20, tmp, 0, 20);

-		BigInteger s = new BigInteger(1, tmp);

-

-		if (log.isEnabled())

-		{

-			log.log(30, "decoded ssh-dss signature: first bytes r(" + ((rsArray[0]) & 0xff) + "), s("

-					+ ((rsArray[20]) & 0xff) + ")");

+		int i = 0;

+		int j = 0;

+		byte[] tmp;

+

+		if (rsArray[0] == 0 && rsArray[1] == 0 && rsArray[2] == 0) {

+			j = ((rsArray[i++] << 24) & 0xff000000) | ((rsArray[i++] << 16) & 0x00ff0000)

+					| ((rsArray[i++] << 8) & 0x0000ff00) | ((rsArray[i++]) & 0x000000ff);

+			i += j;

+			j = ((rsArray[i++] << 24) & 0xff000000) | ((rsArray[i++] << 16) & 0x00ff0000)

+					| ((rsArray[i++] << 8) & 0x0000ff00) | ((rsArray[i++]) & 0x000000ff);

+			tmp = new byte[j];

+			System.arraycopy(rsArray, i, tmp, 0, j);

+			rsArray = tmp;

 		}

 

-		return new DSASignature(r, s);

-	}

-

-	public static boolean verifySignature(byte[] message, DSASignature ds, DSAPublicKey dpk) throws IOException

-	{

-		/* Inspired by Bouncycastle's DSASigner class */

-

-		SHA1 md = new SHA1();

-		md.update(message);

-		byte[] sha_message = new byte[md.getDigestLength()];

-		md.digest(sha_message);

+		/* ASN.1 */

+		int frst = ((rsArray[0] & 0x80) != 0 ? 1 : 0);

+		int scnd = ((rsArray[20] & 0x80) != 0 ? 1 : 0);

 

-		BigInteger m = new BigInteger(1, sha_message);

+		/* Calculate output length */

+		int length = rsArray.length + 6 + frst + scnd;

+		tmp = new byte[length];

 

-		BigInteger r = ds.getR();

-		BigInteger s = ds.getS();

+		/* DER-encoding to match Java */

+		tmp[0] = (byte) 0x30;

 

-		BigInteger g = dpk.getG();

-		BigInteger p = dpk.getP();

-		BigInteger q = dpk.getQ();

-		BigInteger y = dpk.getY();

-

-		BigInteger zero = BigInteger.ZERO;

+			if (rsArray.length != 40)

+				throw new IOException("Peer sent corrupt signature");

+		/* Calculate length */

+		tmp[1] = (byte) 0x2c;

+		tmp[1] += frst;

+		tmp[1] += scnd;

 

-		if (log.isEnabled())

-		{

-			log.log(60, "ssh-dss signature: m: " + m.toString(16));

-			log.log(60, "ssh-dss signature: r: " + r.toString(16));

-			log.log(60, "ssh-dss signature: s: " + s.toString(16));

-			log.log(60, "ssh-dss signature: g: " + g.toString(16));

-			log.log(60, "ssh-dss signature: p: " + p.toString(16));

-			log.log(60, "ssh-dss signature: q: " + q.toString(16));

-			log.log(60, "ssh-dss signature: y: " + y.toString(16));

-		}

+		/* First item */

+		tmp[2] = (byte) 0x02;

 

-		if (zero.compareTo(r) >= 0 || q.compareTo(r) <= 0)

-		{

-			log.log(20, "ssh-dss signature: zero.compareTo(r) >= 0 || q.compareTo(r) <= 0");

-			return false;

-		}

+		/* First item length */

+		tmp[3] = (byte) 0x14;

+		tmp[3] += frst;

 

-		if (zero.compareTo(s) >= 0 || q.compareTo(s) <= 0)

-		{

-			log.log(20, "ssh-dss signature: zero.compareTo(s) >= 0 || q.compareTo(s) <= 0");

-			return false;

-		}

+		/* Copy in the data for first item */

+		System.arraycopy(rsArray, 0, tmp, 4 + frst, 20);

 

-		BigInteger w = s.modInverse(q);

+		/* Second item */

+		tmp[4 + tmp[3]] = (byte) 0x02;

 

-		BigInteger u1 = m.multiply(w).mod(q);

-		BigInteger u2 = r.multiply(w).mod(q);

+		/* Second item length */

+		tmp[5 + tmp[3]] = (byte) 0x14;

+		tmp[5 + tmp[3]] += scnd;

 

-		u1 = g.modPow(u1, p);

-		u2 = y.modPow(u2, p);

+		/* Copy in the data for the second item */

+		System.arraycopy(rsArray, 20, tmp, 6 + tmp[3] + scnd, 20);

 

-		BigInteger v = u1.multiply(u2).mod(p).mod(q);

+		/* Swap buffers */

+		rsArray = tmp;

 

-		return v.equals(r);

+		return rsArray;

 	}

 

-	public static DSASignature generateSignature(byte[] message, DSAPrivateKey pk, SecureRandom rnd)

+	public static boolean verifySignature(byte[] message, byte[] ds, DSAPublicKey dpk) throws IOException

 	{

-		SHA1 md = new SHA1();

-		md.update(message);

-		byte[] sha_message = new byte[md.getDigestLength()];

-		md.digest(sha_message);

-

-		BigInteger m = new BigInteger(1, sha_message);

-		BigInteger k;

-		int qBitLength = pk.getQ().bitLength();

-

-		do

-		{

-			k = new BigInteger(qBitLength, rnd);

+		try {

+			Signature s = Signature.getInstance("SHA1withDSA");

+			s.initVerify(dpk);

+			s.update(message);

+			return s.verify(ds);

+		} catch (NoSuchAlgorithmException e) {

+			IOException ex = new IOException("No such algorithm");

+			ex.initCause(e);

+			throw ex;

+		} catch (InvalidKeyException e) {

+			IOException ex = new IOException("No such algorithm");

+			ex.initCause(e);

+			throw ex;

+		} catch (SignatureException e) {

+			IOException ex = new IOException();

+			ex.initCause(e);

+			throw ex;

 		}

-		while (k.compareTo(pk.getQ()) >= 0);

-

-		BigInteger r = pk.getG().modPow(k, pk.getP()).mod(pk.getQ());

-

-		k = k.modInverse(pk.getQ()).multiply(m.add((pk).getX().multiply(r)));

-

-		BigInteger s = k.mod(pk.getQ());

+	}

 

-		return new DSASignature(r, s);

+	public static byte[] generateSignature(byte[] message, DSAPrivateKey pk, SecureRandom rnd) throws IOException

+	{

+		try {

+			Signature s = Signature.getInstance("SHA1withDSA");

+			s.initSign(pk);

+			s.update(message);

+			return s.sign();

+		} catch (NoSuchAlgorithmException e) {

+			IOException ex = new IOException();

+			ex.initCause(e);

+			throw ex;

+		} catch (InvalidKeyException e) {

+			IOException ex = new IOException();

+			ex.initCause(e);

+			throw ex;

+		} catch (SignatureException e) {

+			IOException ex = new IOException();

+			ex.initCause(e);

+			throw ex;

+		}

 	}

 }

diff --git a/lib/src/main/java/com/trilead/ssh2/signature/DSASignature.java b/lib/src/main/java/com/trilead/ssh2/signature/DSASignature.java
deleted file mode 100644
index eff84cd..0000000
--- a/lib/src/main/java/com/trilead/ssh2/signature/DSASignature.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.trilead.ssh2.signature;

-

-import java.math.BigInteger;

-

-/**

- * DSASignature.

- * 

- * @author Christian Plattner, plattner@trilead.com

- * @version $Id: DSASignature.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $

- */

-public class DSASignature

-{

-	private BigInteger r;

-	private BigInteger s;

-

-	public DSASignature(BigInteger r, BigInteger s)

-	{

-		this.r = r;

-		this.s = s;

-	}

-

-	public BigInteger getR()

-	{

-		return r;

-	}

-

-	public BigInteger getS()

-	{

-		return s;

-	}

-}

diff --git a/lib/src/main/java/com/trilead/ssh2/signature/RSAPrivateKey.java b/lib/src/main/java/com/trilead/ssh2/signature/RSAPrivateKey.java
deleted file mode 100644
index 5d5e606..0000000
--- a/lib/src/main/java/com/trilead/ssh2/signature/RSAPrivateKey.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.trilead.ssh2.signature;

-

-import java.math.BigInteger;

-

-/**

- * RSAPrivateKey.

- * 

- * @author Christian Plattner, plattner@trilead.com

- * @version $Id: RSAPrivateKey.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $

- */

-public class RSAPrivateKey

-{

-	private BigInteger d;

-	private BigInteger e;

-	private BigInteger n;

-

-	public RSAPrivateKey(BigInteger d, BigInteger e, BigInteger n)

-	{

-		this.d = d;

-		this.e = e;

-		this.n = n;

-	}

-

-	public BigInteger getD()

-	{

-		return d;

-	}

-	

-	public BigInteger getE()

-	{

-		return e;

-	}

-

-	public BigInteger getN()

-	{

-		return n;

-	}

-	

-	public RSAPublicKey getPublicKey()

-	{

-		return new RSAPublicKey(e, n);

-	}

-}
\ No newline at end of file
diff --git a/lib/src/main/java/com/trilead/ssh2/signature/RSAPublicKey.java b/lib/src/main/java/com/trilead/ssh2/signature/RSAPublicKey.java
deleted file mode 100644
index e7e6611..0000000
--- a/lib/src/main/java/com/trilead/ssh2/signature/RSAPublicKey.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.trilead.ssh2.signature;

-

-import java.math.BigInteger;

-

-/**

- * RSAPublicKey.

- * 

- * @author Christian Plattner, plattner@trilead.com

- * @version $Id: RSAPublicKey.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $

- */

-public class RSAPublicKey

-{

-	BigInteger e;

-	BigInteger n;

-

-	public RSAPublicKey(BigInteger e, BigInteger n)

-	{

-		this.e = e;

-		this.n = n;

-	}

-

-	public BigInteger getE()

-	{

-		return e;

-	}

-

-	public BigInteger getN()

-	{

-		return n;

-	}

-}
\ No newline at end of file
diff --git a/lib/src/main/java/com/trilead/ssh2/signature/RSASHA1Verify.java b/lib/src/main/java/com/trilead/ssh2/signature/RSASHA1Verify.java
index 8a0f07a..9b5c18e 100644
--- a/lib/src/main/java/com/trilead/ssh2/signature/RSASHA1Verify.java
+++ b/lib/src/main/java/com/trilead/ssh2/signature/RSASHA1Verify.java
@@ -3,9 +3,17 @@ package com.trilead.ssh2.signature;
 

 import java.io.IOException;

 import java.math.BigInteger;

+import java.security.InvalidKeyException;

+import java.security.KeyFactory;

+import java.security.NoSuchAlgorithmException;

+import java.security.Signature;

+import java.security.SignatureException;

+import java.security.interfaces.RSAPrivateKey;

+import java.security.interfaces.RSAPublicKey;

+import java.security.spec.InvalidKeySpecException;

+import java.security.spec.KeySpec;

+import java.security.spec.RSAPublicKeySpec;

 

-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;

@@ -36,7 +44,20 @@ public class RSASHA1Verify
 		if (tr.remain() != 0)

 			throw new IOException("Padding in RSA public key!");

 

-		return new RSAPublicKey(e, n);

+		KeySpec keySpec = new RSAPublicKeySpec(n, e);

+

+		try {

+			KeyFactory kf = KeyFactory.getInstance("RSA");

+			return (RSAPublicKey) kf.generatePublic(keySpec);

+		} catch (NoSuchAlgorithmException nsae) {

+			IOException ioe = new IOException("No RSA KeyFactory available");

+			ioe.initCause(nsae);

+			throw ioe;

+		} catch (InvalidKeySpecException ikse) {

+			IOException ioe = new IOException("No RSA KeyFactory available");

+			ioe.initCause(ikse);

+			throw ioe;

+		}

 	}

 

 	public static byte[] encodeSSHRSAPublicKey(RSAPublicKey pk) throws IOException

@@ -44,13 +65,13 @@ public class RSASHA1Verify
 		TypesWriter tw = new TypesWriter();

 

 		tw.writeString("ssh-rsa");

-		tw.writeMPInt(pk.getE());

-		tw.writeMPInt(pk.getN());

+		tw.writeMPInt(pk.getPublicExponent());

+		tw.writeMPInt(pk.getModulus());

 

 		return tw.getBytes();

 	}

 

-	public static RSASignature decodeSSHRSASignature(byte[] sig) throws IOException

+	public static byte[] decodeSSHRSASignature(byte[] sig) throws IOException

 	{

 		TypesReader tr = new TypesReader(sig);

 

@@ -77,10 +98,22 @@ public class RSASHA1Verify
 		if (tr.remain() != 0)

 			throw new IOException("Padding in RSA signature!");

 

-		return new RSASignature(new BigInteger(1, s));

+		if (s[0] == 0 && s[1] == 0 && s[2] == 0) {

+			int i = 0;

+			int j = ((s[i++] << 24) & 0xff000000) | ((s[i++] << 16) & 0x00ff0000)

+					| ((s[i++] << 8) & 0x0000ff00) | ((s[i++]) & 0x000000ff);

+			i += j;

+			j = ((s[i++] << 24) & 0xff000000) | ((s[i++] << 16) & 0x00ff0000)

+					| ((s[i++] << 8) & 0x0000ff00) | ((s[i++]) & 0x000000ff);

+			byte[] tmp = new byte[j];

+			System.arraycopy(s, i, tmp, 0, j);

+			sig = tmp;

+		}

+

+		return s;

 	}

 

-	public static byte[] encodeSSHRSASignature(RSASignature sig) throws IOException

+	public static byte[] encodeSSHRSASignature(byte[] s) throws IOException

 	{

 		TypesWriter tw = new TypesWriter();

 

@@ -91,8 +124,6 @@ public class RSASHA1Verify
 		 * network byte order)."

 		 */

 

-		byte[] s = sig.getS().toByteArray();

-

 		/* Remove first zero sign byte, if present */

 

 		if ((s.length > 1) && (s[0] == 0x00))

@@ -103,183 +134,47 @@ public class RSASHA1Verify
 		return tw.getBytes();

 	}

 

-	public static RSASignature generateSignature(byte[] message, RSAPrivateKey pk) throws IOException

+	public static byte[] generateSignature(byte[] message, RSAPrivateKey pk) throws IOException

 	{

-		SHA1 md = new SHA1();

-		md.update(message);

-		byte[] sha_message = new byte[md.getDigestLength()];

-		md.digest(sha_message);

-

-		byte[] der_header = new byte[] { 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00,

-				0x04, 0x14 };

-

-		int rsa_block_len = (pk.getN().bitLength() + 7) / 8;

-

-		int num_pad = rsa_block_len - (2 + der_header.length + sha_message.length) - 1;

-

-		if (num_pad < 8)

-			throw new IOException("Cannot sign with RSA, message too long");

-

-		byte[] sig = new byte[der_header.length + sha_message.length + 2 + num_pad];

-

-		sig[0] = 0x01;

-

-		for (int i = 0; i < num_pad; i++)

-		{

-			sig[i + 1] = (byte) 0xff;

+		try {

+			Signature s = Signature.getInstance("SHA1withRSA");

+			s.initSign(pk);

+			s.update(message);

+			return s.sign();

+		} catch (NoSuchAlgorithmException e) {

+			IOException ex = new IOException();

+			ex.initCause(e);

+			throw ex;

+		} catch (InvalidKeyException e) {

+			IOException ex =  new IOException();

+			ex.initCause(e);

+			throw ex;

+		} catch (SignatureException e) {

+			IOException ex =  new IOException();

+			ex.initCause(e);

+			throw ex;

 		}

-

-		sig[num_pad + 1] = 0x00;

-

-		System.arraycopy(der_header, 0, sig, 2 + num_pad, der_header.length);

-		System.arraycopy(sha_message, 0, sig, 2 + num_pad + der_header.length, sha_message.length);

-

-		BigInteger m = new BigInteger(1, sig);

-

-		BigInteger s = m.modPow(pk.getD(), pk.getN());

-

-		return new RSASignature(s);

 	}

 

-	public static boolean verifySignature(byte[] message, RSASignature ds, RSAPublicKey dpk) throws IOException

+	public static boolean verifySignature(byte[] message, byte[] ds, RSAPublicKey dpk) throws IOException

 	{

-		SHA1 md = new SHA1();

-		md.update(message);

-		byte[] sha_message = new byte[md.getDigestLength()];

-		md.digest(sha_message);

-

-		BigInteger n = dpk.getN();

-		BigInteger e = dpk.getE();

-		BigInteger s = ds.getS();

-

-		if (n.compareTo(s) <= 0)

-		{

-			log.log(20, "ssh-rsa signature: n.compareTo(s) <= 0");

-			return false;

-		}

-

-		int rsa_block_len = (n.bitLength() + 7) / 8;

-

-		/* And now the show begins */

-

-		if (rsa_block_len < 1)

-		{

-			log.log(20, "ssh-rsa signature: rsa_block_len < 1");

-			return false;

-		}

-

-		byte[] v = s.modPow(e, n).toByteArray();

-

-		int startpos = 0;

-

-		if ((v.length > 0) && (v[0] == 0x00))

-			startpos++;

-

-		if ((v.length - startpos) != (rsa_block_len - 1))

-		{

-			log.log(20, "ssh-rsa signature: (v.length - startpos) != (rsa_block_len - 1)");

-			return false;

-		}

-

-		if (v[startpos] != 0x01)

-		{

-			log.log(20, "ssh-rsa signature: v[startpos] != 0x01");

-			return false;

-		}

-

-		int pos = startpos + 1;

-

-		while (true)

-		{

-			if (pos >= v.length)

-			{

-				log.log(20, "ssh-rsa signature: pos >= v.length");

-				return false;

-			}

-			if (v[pos] == 0x00)

-				break;

-			if (v[pos] != (byte) 0xff)

-			{

-				log.log(20, "ssh-rsa signature: v[pos] != (byte) 0xff");

-				return false;

-			}

-			pos++;

-		}

-

-		int num_pad = pos - (startpos + 1);

-

-		if (num_pad < 8)

-		{

-			log.log(20, "ssh-rsa signature: num_pad < 8");

-			return false;

-		}

-

-		pos++;

-

-		if (pos >= v.length)

-		{

-			log.log(20, "ssh-rsa signature: pos >= v.length");

-			return false;

-		}

-

-		SimpleDERReader dr = new SimpleDERReader(v, pos, v.length - pos);

-

-		byte[] seq = dr.readSequenceAsByteArray();

-

-		if (dr.available() != 0)

-		{

-			log.log(20, "ssh-rsa signature: dr.available() != 0");

-			return false;

-		}

-

-		dr.resetInput(seq);

-

-		/* Read digestAlgorithm */

-

-		byte digestAlgorithm[] = dr.readSequenceAsByteArray();

-

-		/* Inspired by RFC 3347, however, ignoring the comment regarding old BER based implementations */

-

-		if ((digestAlgorithm.length < 8) || (digestAlgorithm.length > 9))

-		{

-			log.log(20, "ssh-rsa signature: (digestAlgorithm.length < 8) || (digestAlgorithm.length > 9)");

-			return false;

-		}

-

-		byte[] digestAlgorithm_sha1 = new byte[] { 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1a, 0x05, 0x00 };

-

-		for (int i = 0; i < digestAlgorithm.length; i++)

-		{

-			if (digestAlgorithm[i] != digestAlgorithm_sha1[i])

-			{

-				log.log(20, "ssh-rsa signature: digestAlgorithm[i] != digestAlgorithm_sha1[i]");

-				return false;

-			}

-		}

-

-		byte[] digest = dr.readOctetString();

-

-		if (dr.available() != 0)

-		{

-			log.log(20, "ssh-rsa signature: dr.available() != 0 (II)");

-			return false;

-		}

-			

-		if (digest.length != sha_message.length)

-		{

-			log.log(20, "ssh-rsa signature: digest.length != sha_message.length");

-			return false;

+		try {

+			Signature s = Signature.getInstance("SHA1withRSA");

+			s.initVerify(dpk);

+			s.update(message);

+			return s.verify(ds);

+		} catch (NoSuchAlgorithmException e) {

+			IOException ex = new IOException();

+			ex.initCause(e);

+			throw ex;

+		} catch (InvalidKeyException e) {

+			IOException ex = new IOException();

+			ex.initCause(e);

+			throw ex;

+		} catch (SignatureException e) {

+			IOException ex = new IOException();

+			ex.initCause(e);

+			throw ex;

 		}

-

-		for (int i = 0; i < sha_message.length; i++)

-		{

-			if (sha_message[i] != digest[i])

-			{

-				log.log(20, "ssh-rsa signature: sha_message[i] != digest[i]");

-				return false;

-			}

-		}

-

-		return true;

 	}

 }

diff --git a/lib/src/main/java/com/trilead/ssh2/signature/RSASignature.java b/lib/src/main/java/com/trilead/ssh2/signature/RSASignature.java
deleted file mode 100644
index e04e7ee..0000000
--- a/lib/src/main/java/com/trilead/ssh2/signature/RSASignature.java
+++ /dev/null
@@ -1,27 +0,0 @@
-

-package com.trilead.ssh2.signature;

-

-import java.math.BigInteger;

-

-

-/**

- * RSASignature.

- * 

- * @author Christian Plattner, plattner@trilead.com

- * @version $Id: RSASignature.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $

- */

-

-public class RSASignature

-{

-	BigInteger s;

-

-	public BigInteger getS()

-	{

-		return s;

-	}

-

-	public RSASignature(BigInteger s)

-	{

-		this.s = s;

-	}

-}
\ No newline at end of file