Revert "Bump apache mina to 1.2.0"

[netconf.git] / netconf / netconf-ssh / src / main / java / org / opendaylight / netconf / ssh / osgi / NetconfSSHActivator.java

diff --git a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/osgi/NetconfSSHActivator.java b/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/osgi/NetconfSSHActivator.java
index 4e9d7c8a19c26123051ebe690639db42b7ea79b9..9cbfac1580a3a22a0c3285129f6cee526f300e8b 100644 (file)
--- a/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/osgi/NetconfSSHActivator.java
+++ b/netconf/netconf-ssh/src/main/java/org/opendaylight/netconf/ssh/osgi/NetconfSSHActivator.java
@@ -10,16 +10,14 @@ package org.opendaylight.netconf.ssh.osgi;
 import com.google.common.base.Optional;
 import io.netty.channel.local.LocalAddress;
 import io.netty.channel.nio.NioEventLoopGroup;
-import java.io.File;
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ThreadFactory;
-import org.apache.sshd.common.util.SecurityUtils;
-import org.apache.sshd.common.util.threads.ThreadUtils;
-import org.apache.sshd.server.keyprovider.AbstractGeneratorHostKeyProvider;
+import org.apache.sshd.common.util.ThreadUtils;
+import org.apache.sshd.server.keyprovider.PEMGeneratorHostKeyProvider;
 import org.opendaylight.netconf.ssh.SshProxyServer;
 import org.opendaylight.netconf.ssh.SshProxyServerConfigurationBuilder;
 import org.opendaylight.netconf.util.osgi.NetconfConfigUtil;
@@ -63,19 +61,19 @@ public class NetconfSSHActivator implements BundleActivator {
             server.close();
         }
 
-        if (authProviderTracker != null) {
+        if(authProviderTracker != null) {
             authProviderTracker.stop();
         }
 
-        if (nioExecutor!=null) {
+        if(nioExecutor!=null) {
             nioExecutor.shutdownNow();
         }
 
-        if (clientGroup != null) {
+        if(clientGroup != null) {
             clientGroup.shutdownGracefully();
         }
 
-        if (minaTimerExecutor != null) {
+        if(minaTimerExecutor != null) {
             minaTimerExecutor.shutdownNow();
         }
     }
@@ -94,7 +92,7 @@ public class NetconfSSHActivator implements BundleActivator {
         authProviderTracker = new AuthProviderTracker(bundleContext);
 
         final Optional<String> maybePath = NetconfConfigUtil.getPrivateKeyPath(bundleContext);
-        if (!maybePath.isPresent()) {
+        if(!maybePath.isPresent()) {
             LOG.warn("Private key path not configured. Using default value {}",
                     NetconfConfigUtil.DEFAULT_PRIVATE_KEY_PATH);
         }
@@ -102,17 +100,12 @@ public class NetconfSSHActivator implements BundleActivator {
         LOG.trace("Starting netconf SSH bridge with path to ssh private key {}", path);
 
         final SshProxyServer sshProxyServer = new SshProxyServer(minaTimerExecutor, clientGroup, nioExecutor);
-        final AbstractGeneratorHostKeyProvider keyPairProvider = SecurityUtils.createGeneratorHostKeyProvider(null);
-        keyPairProvider.setAlgorithm(ALGORITHM);
-        keyPairProvider.setKeySize(KEY_SIZE);
-        keyPairProvider.setFile(new File(path));
-
         sshProxyServer.bind(
                 new SshProxyServerConfigurationBuilder()
                         .setBindingAddress(sshSocketAddress)
                         .setLocalAddress(localAddress)
                         .setAuthenticator(authProviderTracker)
-                        .setKeyPairProvider(keyPairProvider)
+                        .setKeyPairProvider(new PEMGeneratorHostKeyProvider(path, ALGORITHM, KEY_SIZE))
                         .setIdleTimeout(DEFAULT_IDLE_TIMEOUT)
                         .createSshProxyServerConfiguration());
         return sshProxyServer;