From f63d09969caae234f89d0561ae89a45574047415 Mon Sep 17 00:00:00 2001 From: Shikhar Bhushan Date: Mon, 1 Mar 2010 23:45:55 +0100 Subject: [PATCH] sig/ reformat --- .../sshj/signature/AbstractSignature.java | 15 +++++++------- .../schmizz/sshj/signature/SignatureDSA.java | 20 +++++++++++++------ .../schmizz/sshj/signature/SignatureRSA.java | 6 ++++-- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/main/java/net/schmizz/sshj/signature/AbstractSignature.java b/src/main/java/net/schmizz/sshj/signature/AbstractSignature.java index 5d5106a1..07029e70 100644 --- a/src/main/java/net/schmizz/sshj/signature/AbstractSignature.java +++ b/src/main/java/net/schmizz/sshj/signature/AbstractSignature.java @@ -44,7 +44,8 @@ import java.security.PublicKey; import java.security.SignatureException; /** An abstract class for {@link Signature} that implements common functionality. */ -public abstract class AbstractSignature implements Signature { +public abstract class AbstractSignature + implements Signature { protected java.security.Signature signature; protected String algorithm; @@ -82,14 +83,14 @@ public abstract class AbstractSignature implements Signature { int i = 0; int j; j = sig[i++] << 24 & 0xff000000 // - | sig[i++] << 16 & 0x00ff0000 // - | sig[i++] << 8 & 0x0000ff00 // - | sig[i++] & 0x000000ff; + | sig[i++] << 16 & 0x00ff0000 // + | sig[i++] << 8 & 0x0000ff00 // + | sig[i++] & 0x000000ff; i += j; j = sig[i++] << 24 & 0xff000000 // - | sig[i++] << 16 & 0x00ff0000 // - | sig[i++] << 8 & 0x0000ff00 // - | sig[i++] & 0x000000ff; + | sig[i++] << 16 & 0x00ff0000 // + | sig[i++] << 8 & 0x0000ff00 // + | sig[i++] & 0x000000ff; byte[] tmp = new byte[j]; System.arraycopy(sig, i, tmp, 0, j); sig = tmp; diff --git a/src/main/java/net/schmizz/sshj/signature/SignatureDSA.java b/src/main/java/net/schmizz/sshj/signature/SignatureDSA.java index f572ee96..78fe3da3 100644 --- a/src/main/java/net/schmizz/sshj/signature/SignatureDSA.java +++ b/src/main/java/net/schmizz/sshj/signature/SignatureDSA.java @@ -41,10 +41,12 @@ import net.schmizz.sshj.common.SSHRuntimeException; import java.security.SignatureException; /** DSA {@link Signature} */ -public class SignatureDSA extends AbstractSignature { +public class SignatureDSA + extends AbstractSignature { /** A named factory for DSA signature */ - public static class Factory implements net.schmizz.sshj.common.Factory.Named { + public static class Factory + implements net.schmizz.sshj.common.Factory.Named { public Signature create() { return new SignatureDSA(); @@ -84,10 +86,16 @@ public class SignatureDSA extends AbstractSignature { // result must be 40 bytes, but length of r and s may not be 20 bytes - System.arraycopy(r, r.length > 20 ? 1 : 0, result, r.length > 20 ? 0 : 20 - r.length, r.length > 20 ? 20 - : r.length); - System.arraycopy(s, s.length > 20 ? 1 : 0, result, s.length > 20 ? 20 : 40 - s.length, s.length > 20 ? 20 - : s.length); + System.arraycopy(r, + r.length > 20 ? 1 : 0, + result, + r.length > 20 ? 0 : 20 - r.length, + r.length > 20 ? 20 : r.length); + System.arraycopy(s, + s.length > 20 ? 1 : 0, + result, + s.length > 20 ? 20 : 40 - s.length, + s.length > 20 ? 20 : s.length); return result; } diff --git a/src/main/java/net/schmizz/sshj/signature/SignatureRSA.java b/src/main/java/net/schmizz/sshj/signature/SignatureRSA.java index 51add884..6cbf1708 100644 --- a/src/main/java/net/schmizz/sshj/signature/SignatureRSA.java +++ b/src/main/java/net/schmizz/sshj/signature/SignatureRSA.java @@ -41,10 +41,12 @@ import net.schmizz.sshj.common.SSHRuntimeException; import java.security.SignatureException; /** RSA {@link Signature} */ -public class SignatureRSA extends AbstractSignature { +public class SignatureRSA + extends AbstractSignature { /** A named factory for RSA {@link Signature} */ - public static class Factory implements net.schmizz.sshj.common.Factory.Named { + public static class Factory + implements net.schmizz.sshj.common.Factory.Named { public Signature create() { return new SignatureRSA();