From 2984291d84093d259f282314004e142087822f87 Mon Sep 17 00:00:00 2001 From: Charles Gould Date: Thu, 7 Sep 2017 16:25:05 -0400 Subject: [PATCH] Removed deprecated method --- .../hierynomus/sshj/signature/SignatureEdDSA.java | 15 --------------- .../schmizz/sshj/signature/AbstractSignature.java | 13 ------------- .../net/schmizz/sshj/signature/Signature.java | 11 ----------- 3 files changed, 39 deletions(-) diff --git a/src/main/java/com/hierynomus/sshj/signature/SignatureEdDSA.java b/src/main/java/com/hierynomus/sshj/signature/SignatureEdDSA.java index fb0e9ad7..726e1b0f 100644 --- a/src/main/java/com/hierynomus/sshj/signature/SignatureEdDSA.java +++ b/src/main/java/com/hierynomus/sshj/signature/SignatureEdDSA.java @@ -47,21 +47,6 @@ public class SignatureEdDSA implements Signature { } } - @Override - public void init(PublicKey pubkey, PrivateKey prvkey) { - try { - if (pubkey != null) { - engine.initVerify(pubkey); - } - - if (prvkey != null) { - engine.initSign(prvkey); - } - } catch (InvalidKeyException e) { - throw new SSHRuntimeException(e); - } - } - @Override public void initVerify(PublicKey pubkey) { try { diff --git a/src/main/java/net/schmizz/sshj/signature/AbstractSignature.java b/src/main/java/net/schmizz/sshj/signature/AbstractSignature.java index 5365e181..2e47c36d 100644 --- a/src/main/java/net/schmizz/sshj/signature/AbstractSignature.java +++ b/src/main/java/net/schmizz/sshj/signature/AbstractSignature.java @@ -34,19 +34,6 @@ public abstract class AbstractSignature this.algorithm = algorithm; } - @Override - public void init(PublicKey publicKey, PrivateKey privateKey) { - try { - signature = SecurityUtils.getSignature(algorithm); - if (publicKey != null) - signature.initVerify(publicKey); - if (privateKey != null) - signature.initSign(privateKey); - } catch (GeneralSecurityException e) { - throw new SSHRuntimeException(e); - } - } - @Override public void initVerify(PublicKey publicKey) { try { diff --git a/src/main/java/net/schmizz/sshj/signature/Signature.java b/src/main/java/net/schmizz/sshj/signature/Signature.java index e16c1101..6ad1ac45 100644 --- a/src/main/java/net/schmizz/sshj/signature/Signature.java +++ b/src/main/java/net/schmizz/sshj/signature/Signature.java @@ -21,17 +21,6 @@ import java.security.PublicKey; /** Signature interface for SSH used to sign or verify data. Usually wraps a {@code javax.crypto.Signature} object. */ public interface Signature { - /** - * Initialize this signature with the given public key and private key. If the private key is null, only signature - * verification can be performed. - * - * @param pubkey (null-ok) specify in case verification is needed - * @param prvkey (null-ok) specify in case signing is needed - * @deprecated Use {@link #initVerify(PublicKey)} or {@link #initSign(PrivateKey)} instead. - */ - @Deprecated - void init(PublicKey pubkey, PrivateKey prvkey); - /** * Initialize this signature with the given public key for signature verification. *