You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2015/12/02 11:00:38 UTC
[6/7] mina-sshd git commit: Made KeyExchange a NamedResource
Made KeyExchange a NamedResource
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/00a5eb61
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/00a5eb61
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/00a5eb61
Branch: refs/heads/master
Commit: 00a5eb61a02df4870342d6fdadd80f8de1159b67
Parents: 76fc62f
Author: Lyor Goldstein <lg...@vmware.com>
Authored: Wed Dec 2 11:59:41 2015 +0200
Committer: Lyor Goldstein <lg...@vmware.com>
Committed: Wed Dec 2 11:59:41 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/sshd/client/kex/DHGClient.java | 10 +++++-----
.../main/java/org/apache/sshd/client/kex/DHGEXClient.java | 10 +++++-----
.../main/java/org/apache/sshd/common/kex/KeyExchange.java | 3 ++-
.../apache/sshd/common/kex/dh/AbstractDHKeyExchange.java | 5 +++++
.../main/java/org/apache/sshd/server/kex/DHGEXServer.java | 10 +++++-----
.../main/java/org/apache/sshd/server/kex/DHGServer.java | 10 +++++-----
6 files changed, 27 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/00a5eb61/sshd-core/src/main/java/org/apache/sshd/client/kex/DHGClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/kex/DHGClient.java b/sshd-core/src/main/java/org/apache/sshd/client/kex/DHGClient.java
index 9ffdb9c..430c296 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/kex/DHGClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/kex/DHGClient.java
@@ -50,6 +50,11 @@ public class DHGClient extends AbstractDHClientKeyExchange {
this.factory = ValidateUtils.checkNotNull(factory, "No factory");
}
+ @Override
+ public final String getName() {
+ return factory.getName();
+ }
+
public static final KeyExchangeFactory newFactory(final DHFactory delegate) {
return new KeyExchangeFactory() {
@Override
@@ -139,9 +144,4 @@ public class DHGClient extends AbstractDHClientKeyExchange {
}
return true;
}
-
- @Override
- public String toString() {
- return getClass().getSimpleName() + "[" + factory.getName() + "]";
- }
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/00a5eb61/sshd-core/src/main/java/org/apache/sshd/client/kex/DHGEXClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/kex/DHGEXClient.java b/sshd-core/src/main/java/org/apache/sshd/client/kex/DHGEXClient.java
index 8548dff..dca86aa 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/kex/DHGEXClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/kex/DHGEXClient.java
@@ -60,6 +60,11 @@ public class DHGEXClient extends AbstractDHClientKeyExchange {
this.prf = Math.min(SecurityUtils.PREFERRED_DHGEX_KEY_SIZE, max);
}
+ @Override
+ public final String getName() {
+ return factory.getName();
+ }
+
public static KeyExchangeFactory newFactory(final DHFactory delegate) {
return new KeyExchangeFactory() {
@Override
@@ -179,9 +184,4 @@ public class DHGEXClient extends AbstractDHClientKeyExchange {
protected AbstractDH getDH(BigInteger p, BigInteger g) throws Exception {
return factory.create(p, g);
}
-
- @Override
- public String toString() {
- return getClass().getSimpleName() + "[" + factory.getName() + "]";
- }
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/00a5eb61/sshd-core/src/main/java/org/apache/sshd/common/kex/KeyExchange.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/kex/KeyExchange.java b/sshd-core/src/main/java/org/apache/sshd/common/kex/KeyExchange.java
index 73c2c21..24fcd57 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/kex/KeyExchange.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/KeyExchange.java
@@ -21,6 +21,7 @@ package org.apache.sshd.common.kex;
import java.security.PublicKey;
import java.util.Map;
+import org.apache.sshd.common.NamedResource;
import org.apache.sshd.common.SshConstants;
import org.apache.sshd.common.digest.Digest;
import org.apache.sshd.common.session.AbstractSession;
@@ -33,7 +34,7 @@ import org.apache.sshd.common.util.logging.LoggingUtils;
*
* @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
*/
-public interface KeyExchange {
+public interface KeyExchange extends NamedResource {
/**
* Initialize the key exchange algorithm.
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/00a5eb61/sshd-core/src/main/java/org/apache/sshd/common/kex/dh/AbstractDHKeyExchange.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/kex/dh/AbstractDHKeyExchange.java b/sshd-core/src/main/java/org/apache/sshd/common/kex/dh/AbstractDHKeyExchange.java
index 6cbb376..666e2b7 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/kex/dh/AbstractDHKeyExchange.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/dh/AbstractDHKeyExchange.java
@@ -73,4 +73,9 @@ public abstract class AbstractDHKeyExchange extends AbstractLoggingBean implemen
public byte[] getK() {
return k;
}
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + "[" + getName() + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/00a5eb61/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java b/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java
index 667db11..4694de4 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGEXServer.java
@@ -68,6 +68,11 @@ public class DHGEXServer extends AbstractDHServerKeyExchange {
this.factory = ValidateUtils.checkNotNull(factory, "No factory");
}
+ @Override
+ public final String getName() {
+ return factory.getName();
+ }
+
public static KeyExchangeFactory newFactory(final DHFactory factory) {
return new KeyExchangeFactory() {
@Override
@@ -309,9 +314,4 @@ public class DHGEXServer extends AbstractDHServerKeyExchange {
protected DHG getDH(BigInteger p, BigInteger g) throws Exception {
return (DHG) factory.create(p, g);
}
-
- @Override
- public String toString() {
- return getClass().getSimpleName() + "[" + factory.getName() + "]";
- }
}
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/00a5eb61/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGServer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGServer.java b/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGServer.java
index 7e1757c..8a9704a 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGServer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/kex/DHGServer.java
@@ -48,6 +48,11 @@ public class DHGServer extends AbstractDHServerKeyExchange {
this.factory = ValidateUtils.checkNotNull(factory, "No factory");
}
+ @Override
+ public final String getName() {
+ return factory.getName();
+ }
+
public static KeyExchangeFactory newFactory(final DHFactory factory) {
return new KeyExchangeFactory() {
@Override
@@ -146,9 +151,4 @@ public class DHGServer extends AbstractDHServerKeyExchange {
session.writePacket(buffer);
return true;
}
-
- @Override
- public String toString() {
- return getClass().getSimpleName() + "[" + factory.getName() + "]";
- }
}