From 3cefda5bd359e3618c988313e6bcd1e46618774c Mon Sep 17 00:00:00 2001 From: hierynomus Date: Tue, 20 Jan 2015 09:31:24 +0100 Subject: [PATCH] Processed review comments from @demobox. Thx! --- src/main/java/net/schmizz/sshj/transport/Transport.java | 2 ++ src/main/java/net/schmizz/sshj/transport/TransportImpl.java | 5 ++--- .../net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/schmizz/sshj/transport/Transport.java b/src/main/java/net/schmizz/sshj/transport/Transport.java index d6de2a6b..00394166 100644 --- a/src/main/java/net/schmizz/sshj/transport/Transport.java +++ b/src/main/java/net/schmizz/sshj/transport/Transport.java @@ -78,6 +78,7 @@ public interface Transport /** * @return the interval in seconds at which a heartbeat message is sent to the server * @deprecated Moved to {@link net.schmizz.keepalive.KeepAlive#getKeepAliveInterval()}. This is accessible through the {@link net.schmizz.sshj.connection.Connection}. + * Scheduled to be removed in 0.12.0 */ @Deprecated int getHeartbeatInterval(); @@ -85,6 +86,7 @@ public interface Transport /** * @param interval the interval in seconds, {@code 0} means no hearbeat * @deprecated Moved to {@link net.schmizz.keepalive.KeepAlive#getKeepAliveInterval()}. This is accessible through the {@link net.schmizz.sshj.connection.Connection}. + * Scheduled to be removed in 0.12.0 */ @Deprecated void setHeartbeatInterval(int interval); diff --git a/src/main/java/net/schmizz/sshj/transport/TransportImpl.java b/src/main/java/net/schmizz/sshj/transport/TransportImpl.java index e7fa7240..721d9417 100644 --- a/src/main/java/net/schmizz/sshj/transport/TransportImpl.java +++ b/src/main/java/net/schmizz/sshj/transport/TransportImpl.java @@ -127,10 +127,9 @@ public final class TransportImpl this.sshClient = null; } - /** + /* * Temporary constructor until we remove support for the set/get Heartbeat interval from transport. - * @param config - * @param sshClient + * @deprecated To be removed in 0.12.0 */ @Deprecated public TransportImpl(Config config, SSHClient sshClient) { diff --git a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java index cc775faa..3e65c49f 100644 --- a/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java +++ b/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java @@ -139,9 +139,7 @@ public class PKCS8KeyFile JcePEMDecryptorProviderBuilder decryptorBuilder = new JcePEMDecryptorProviderBuilder(); decryptorBuilder.setProvider("BC"); try { - // Do not return null, as JcePEMDecryptorProviderBuilder$1$1.decrypt would throw an exception - // in that case because it requires a 'password' (i.e. passphrase). - passphrase = pwdf == null ? "".toCharArray() : pwdf.reqPassword(resource); + passphrase = pwdf == null ? null : pwdf.reqPassword(resource); kp = pemConverter.getKeyPair(encryptedKeyPair.decryptKeyPair(decryptorBuilder.build(passphrase))); } finally { PasswordUtils.blankOut(passphrase);