From e420593fa9af3737531ab937eb6dd60d594c24e5 Mon Sep 17 00:00:00 2001 From: David Solin Date: Fri, 9 Sep 2016 16:03:45 -0500 Subject: [PATCH] Okay, more spaces Codacy, you win! --- .../java/net/schmizz/sshj/common/Buffer.java | 18 +++---- .../userauth/keyprovider/PKCS5KeyFile.java | 50 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/net/schmizz/sshj/common/Buffer.java b/src/main/java/net/schmizz/sshj/common/Buffer.java index b3b8c9e5..aab13eb6 100644 --- a/src/main/java/net/schmizz/sshj/common/Buffer.java +++ b/src/main/java/net/schmizz/sshj/common/Buffer.java @@ -427,16 +427,16 @@ public class Buffer> { throws BufferException { try { final KeyType type = KeyType.fromString(readString()); - switch(type) { - case RSA: - case DSA: - return type.readPubKeyFromBuffer(this); - default: - if (SecurityUtils.isBouncyCastleRegistered()) { + switch (type) { + case RSA: + case DSA: return type.readPubKeyFromBuffer(this); - } else { - throw new BufferException("BouncyCastle is required to read a key of type " + type); - } + default: + if (SecurityUtils.isBouncyCastleRegistered()) { + return type.readPubKeyFromBuffer(this); + } else { + throw new BufferException("BouncyCastle is required to read a key of type " + type); + } } } catch (GeneralSecurityException e) { throw new SSHRuntimeException(e); diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS5KeyFile.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS5KeyFile.java index 8652c36f..8f31ca7e 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS5KeyFile.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS5KeyFile.java @@ -194,31 +194,31 @@ public class PKCS5KeyFile throw new FormatException("PKCS5 header not found"); } ASN1Data asn = new ASN1Data(data = decrypt(Base64.decode(sb.toString()), cipher, iv)); - switch(type) { - case RSA: { - KeyFactory factory = KeyFactory.getInstance("RSA"); - asn.readNext(); - BigInteger modulus = asn.readNext(); - BigInteger pubExp = asn.readNext(); - BigInteger prvExp = asn.readNext(); - PublicKey pubKey = factory.generatePublic(new RSAPublicKeySpec(modulus, pubExp)); - PrivateKey prvKey = factory.generatePrivate(new RSAPrivateKeySpec(modulus, prvExp)); - return new KeyPair(pubKey, prvKey); - } - case DSA: { - KeyFactory factory = KeyFactory.getInstance("DSA"); - asn.readNext(); - BigInteger p = asn.readNext(); - BigInteger q = asn.readNext(); - BigInteger g = asn.readNext(); - BigInteger pub = asn.readNext(); - BigInteger prv = asn.readNext(); - PublicKey pubKey = factory.generatePublic(new DSAPublicKeySpec(pub, p, q, g)); - PrivateKey prvKey = factory.generatePrivate(new DSAPrivateKeySpec(prv, p, q, g)); - return new KeyPair(pubKey, prvKey); - } - default: - throw new IOException("Unrecognized PKCS5 key type: " + type); + switch (type) { + case RSA: { + KeyFactory factory = KeyFactory.getInstance("RSA"); + asn.readNext(); + BigInteger modulus = asn.readNext(); + BigInteger pubExp = asn.readNext(); + BigInteger prvExp = asn.readNext(); + PublicKey pubKey = factory.generatePublic(new RSAPublicKeySpec(modulus, pubExp)); + PrivateKey prvKey = factory.generatePrivate(new RSAPrivateKeySpec(modulus, prvExp)); + return new KeyPair(pubKey, prvKey); + } + case DSA: { + KeyFactory factory = KeyFactory.getInstance("DSA"); + asn.readNext(); + BigInteger p = asn.readNext(); + BigInteger q = asn.readNext(); + BigInteger g = asn.readNext(); + BigInteger pub = asn.readNext(); + BigInteger prv = asn.readNext(); + PublicKey pubKey = factory.generatePublic(new DSAPublicKeySpec(pub, p, q, g)); + PrivateKey prvKey = factory.generatePrivate(new DSAPrivateKeySpec(prv, p, q, g)); + return new KeyPair(pubKey, prvKey); + } + default: + throw new IOException("Unrecognized PKCS5 key type: " + type); } } catch (NoSuchAlgorithmException e) { throw new IOException(e);