Updated Branches: refs/heads/master 0095939bd -> 9861e8042
[SSHD-273] Add RFC 6668 (HMAC SHA-2) support Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/9861e804 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/9861e804 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/9861e804 Branch: refs/heads/master Commit: 9861e80423489d6e20e36b092712fd0c10c9e6f6 Parents: 0095939 Author: Guillaume Nodet <[email protected]> Authored: Thu Jan 23 18:09:00 2014 +0100 Committer: Guillaume Nodet <[email protected]> Committed: Thu Jan 23 18:09:00 2014 +0100 ---------------------------------------------------------------------- sshd-core/src/main/java/org/apache/sshd/SshClient.java | 10 +++++++--- sshd-core/src/main/java/org/apache/sshd/SshServer.java | 10 +++++++--- .../main/java/org/apache/sshd/common/mac/HMACSHA256.java | 7 +++++++ .../main/java/org/apache/sshd/common/mac/HMACSHA512.java | 7 +++++++ 4 files changed, 28 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9861e804/sshd-core/src/main/java/org/apache/sshd/SshClient.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/SshClient.java b/sshd-core/src/main/java/org/apache/sshd/SshClient.java index 7484b8c..7cbba98 100644 --- a/sshd-core/src/main/java/org/apache/sshd/SshClient.java +++ b/sshd-core/src/main/java/org/apache/sshd/SshClient.java @@ -77,6 +77,8 @@ import org.apache.sshd.common.mac.HMACMD5; import org.apache.sshd.common.mac.HMACMD596; import org.apache.sshd.common.mac.HMACSHA1; import org.apache.sshd.common.mac.HMACSHA196; +import org.apache.sshd.common.mac.HMACSHA256; +import org.apache.sshd.common.mac.HMACSHA512; import org.apache.sshd.common.random.BouncyCastleRandom; import org.apache.sshd.common.random.JceRandom; import org.apache.sshd.common.random.SingletonRandomFactory; @@ -294,10 +296,12 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa client.setCompressionFactories(Arrays.<NamedFactory<Compression>>asList( new CompressionNone.Factory())); client.setMacFactories(Arrays.<NamedFactory<Mac>>asList( - new HMACMD5.Factory(), + new HMACSHA256.Factory(), + new HMACSHA512.Factory(), new HMACSHA1.Factory(), - new HMACMD596.Factory(), - new HMACSHA196.Factory())); + new HMACMD5.Factory(), + new HMACSHA196.Factory(), + new HMACMD596.Factory())); client.setSignatureFactories(Arrays.<NamedFactory<Signature>>asList( new SignatureDSA.Factory(), new SignatureRSA.Factory())); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9861e804/sshd-core/src/main/java/org/apache/sshd/SshServer.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/SshServer.java b/sshd-core/src/main/java/org/apache/sshd/SshServer.java index d75e201..f2c5b72 100644 --- a/sshd-core/src/main/java/org/apache/sshd/SshServer.java +++ b/sshd-core/src/main/java/org/apache/sshd/SshServer.java @@ -72,6 +72,8 @@ import org.apache.sshd.common.mac.HMACMD5; import org.apache.sshd.common.mac.HMACMD596; import org.apache.sshd.common.mac.HMACSHA1; import org.apache.sshd.common.mac.HMACSHA196; +import org.apache.sshd.common.mac.HMACSHA256; +import org.apache.sshd.common.mac.HMACSHA512; import org.apache.sshd.common.random.BouncyCastleRandom; import org.apache.sshd.common.random.JceRandom; import org.apache.sshd.common.random.SingletonRandomFactory; @@ -435,10 +437,12 @@ public class SshServer extends AbstractFactoryManager implements ServerFactoryMa sshd.setCompressionFactories(Arrays.<NamedFactory<Compression>>asList( new CompressionNone.Factory())); sshd.setMacFactories(Arrays.<NamedFactory<Mac>>asList( - new HMACMD5.Factory(), + new HMACSHA256.Factory(), + new HMACSHA512.Factory(), new HMACSHA1.Factory(), - new HMACMD596.Factory(), - new HMACSHA196.Factory())); + new HMACMD5.Factory(), + new HMACSHA196.Factory(), + new HMACMD596.Factory())); sshd.setChannelFactories(Arrays.<NamedFactory<Channel>>asList( new ChannelSession.Factory(), new TcpipServerChannel.DirectTcpipFactory())); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9861e804/sshd-core/src/main/java/org/apache/sshd/common/mac/HMACSHA256.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/mac/HMACSHA256.java b/sshd-core/src/main/java/org/apache/sshd/common/mac/HMACSHA256.java new file mode 100644 index 0000000..1c4bfb5 --- /dev/null +++ b/sshd-core/src/main/java/org/apache/sshd/common/mac/HMACSHA256.java @@ -0,0 +1,7 @@ +package org.apache.sshd.common.mac; + +/** + * Created by gnodet on 23/01/14. + */ +public class HMACSHA256 { +} http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9861e804/sshd-core/src/main/java/org/apache/sshd/common/mac/HMACSHA512.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/mac/HMACSHA512.java b/sshd-core/src/main/java/org/apache/sshd/common/mac/HMACSHA512.java new file mode 100644 index 0000000..b53dcc5 --- /dev/null +++ b/sshd-core/src/main/java/org/apache/sshd/common/mac/HMACSHA512.java @@ -0,0 +1,7 @@ +package org.apache.sshd.common.mac; + +/** + * Created by gnodet on 23/01/14. + */ +public class HMACSHA512 { +}
