Shade mina-sshd

[netconf.git] / netconf / netconf-netty-util / src / main / java / org / opendaylight / netconf / nettyutil / handler / ssh / authentication / PublicKeyAuth.java

diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java
index 420a216bd647f02caff739019969080a38262061..fff34f3679a226315ff33569a1eb2ad83b39a133 100644 (file)
--- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java
+++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/ssh/authentication/PublicKeyAuth.java
@@ -10,23 +10,22 @@ package org.opendaylight.netconf.nettyutil.handler.ssh.authentication;
 import com.google.common.base.Strings;
 import java.io.IOException;
 import java.security.KeyPair;
-import org.apache.sshd.ClientSession;
-import org.apache.sshd.client.future.AuthFuture;
-import org.opendaylight.aaa.encrypt.AAAEncryptionService;
 import org.opendaylight.aaa.encrypt.PKIUtil;
+import org.opendaylight.netconf.shaded.sshd.client.future.AuthFuture;
+import org.opendaylight.netconf.shaded.sshd.client.session.ClientSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Represents Auth information for the public key based authentication for netconf.
  */
-public class PublicKeyAuth extends LoginPassword {
+public class PublicKeyAuth extends LoginPasswordHandler {
     private KeyPair keyPair = null;
     private static final Logger LOG = LoggerFactory.getLogger(PublicKeyAuth.class);
 
-    public PublicKeyAuth(String username, String password, String keyPath,
-            String passPhrase, AAAEncryptionService encryptionService) {
-        super(username, password, encryptionService);
+    public PublicKeyAuth(final String username, final String password, final String keyPath,
+                         String passPhrase) {
+        super(username, password);
         try {
             boolean isKeyPathAbsent = Strings.isNullOrEmpty(keyPath);
             passPhrase = Strings.isNullOrEmpty(passPhrase) ? "" : passPhrase;