You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2014/10/15 23:33:53 UTC
[1/2] git commit: Change version to 0.9.1-SNAPSHOT
Repository: mina-sshd
Updated Branches:
refs/heads/0.9.x [created] cc7162acf
Change version to 0.9.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/aede1989
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/aede1989
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/aede1989
Branch: refs/heads/0.9.x
Commit: aede198952651c003048097c5c48807da8a8f7b4
Parents: 5bd7629
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Oct 15 23:29:54 2014 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Oct 15 23:29:54 2014 +0200
----------------------------------------------------------------------
assembly/pom.xml | 4 ++--
pom.xml | 2 +-
sshd-core/pom.xml | 4 ++--
sshd-pam/pom.xml | 4 ++--
sshd-sftp/pom.xml | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/aede1989/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 5aa88a1..4d7de87 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.sshd</groupId>
<artifactId>apache-sshd</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Mina SSHD :: Assembly</name>
<packaging>pom</packaging>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/aede1989/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index edfa948..f931a57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Mina SSHD</name>
<packaging>pom</packaging>
<inceptionYear>2008</inceptionYear>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/aede1989/sshd-core/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-core/pom.xml b/sshd-core/pom.xml
index 97d3b23..9e5937b 100644
--- a/sshd-core/pom.xml
+++ b/sshd-core/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Mina SSHD :: Core</name>
<packaging>jar</packaging>
<inceptionYear>2008</inceptionYear>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/aede1989/sshd-pam/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-pam/pom.xml b/sshd-pam/pom.xml
index 388263d..ac28509 100644
--- a/sshd-pam/pom.xml
+++ b/sshd-pam/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-pam</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Mina SSHD :: PAM</name>
<!--
<packaging>bundle</packaging>
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/aede1989/sshd-sftp/pom.xml
----------------------------------------------------------------------
diff --git a/sshd-sftp/pom.xml b/sshd-sftp/pom.xml
index 24dc927..7ba15f5 100644
--- a/sshd-sftp/pom.xml
+++ b/sshd-sftp/pom.xml
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.9.1-SNAPSHOT</version>
<name>Apache Mina SSHD :: SFTP</name>
<packaging>jar</packaging>
<inceptionYear>2008</inceptionYear>
[2/2] git commit: [SSHD-348] Backport SSHD-330 to 0.9.x branch
Posted by gn...@apache.org.
[SSHD-348] Backport SSHD-330 to 0.9.x branch
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/cc7162ac
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/cc7162ac
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/cc7162ac
Branch: refs/heads/0.9.x
Commit: cc7162acf7ca89561ca57a9c68de735f17bf168b
Parents: aede198
Author: Guillaume Nodet <gn...@apache.org>
Authored: Wed Oct 15 23:32:23 2014 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Wed Oct 15 23:33:03 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/sshd/common/kex/DH.java | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/cc7162ac/sshd-core/src/main/java/org/apache/sshd/common/kex/DH.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/kex/DH.java b/sshd-core/src/main/java/org/apache/sshd/common/kex/DH.java
index 8b05f29..4102e2e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/kex/DH.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/kex/DH.java
@@ -70,7 +70,7 @@ public class DH {
DHPublicKeySpec keySpec = new DHPublicKeySpec(f, p, g);
PublicKey yourPubKey = myKeyFac.generatePublic(keySpec);
myKeyAgree.doPhase(yourPubKey, true);
- byte[] mySharedSecret = myKeyAgree.generateSecret();
+ byte[] mySharedSecret = stripLeadingZeroes(myKeyAgree.generateSecret());
K = new BigInteger(mySharedSecret);
K_array = mySharedSecret;
}
@@ -100,4 +100,19 @@ public class DH {
void setF(BigInteger f) {
this.f = f;
}
+
+ // The shared secret returned by KeyAgreement.generateSecret() is
+ // a byte array, which can (by chance, roughly 1 out of 256 times)
+ // begin with zero byte (some JCE providers might strip this, though).
+ // In SSH, the shared secret is an integer, so we need to strip
+ // the leading zero(es).
+ private static byte[] stripLeadingZeroes(byte[] x) {
+ int i = 0;
+ while ((i < x.length - 1) && (x[i] == 0)) {
+ i++;
+ }
+ byte[] ret = new byte[x.length - i];
+ System.arraycopy(x, i, ret, 0, ret.length);
+ return ret;
+ }
}