From c31e17f005bd36ce4a15aa129c833d880fabb873 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Tue, 22 Apr 2014 19:20:10 +0900
Subject: [PATCH] Update sshd to 0.11.0

Fixes a few issues including a null pointer exception [1] that causes
ssh commands to hang.

It also adds server driven rekeying after 1G bytes of data transferred,
which is a useful security feature.

[1] https://issues.apache.org/jira/browse/SSHD-307

Change-Id: I441995eaf76e4fe53f7991f5aef00e062900791b
---
 .../src/main/java/com/google/gerrit/sshd/SshDaemon.java      | 5 +++++
 lib/mina/BUCK                                                | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
index d6365e082e..cf4384463d 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java
@@ -574,6 +574,11 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
           @Override
           public SshFile getFile(String file) {
             return null;
+          }
+
+          @Override
+          public FileSystemView getNormalizedView() {
+            return null;
           }};
       }
     });
diff --git a/lib/mina/BUCK b/lib/mina/BUCK
index a3577c2da0..95e476100f 100644
--- a/lib/mina/BUCK
+++ b/lib/mina/BUCK
@@ -8,8 +8,8 @@ EXCLUDE = [
 
 maven_jar(
   name = 'sshd',
-  id = 'org.apache.sshd:sshd-core:0.10.1',
-  sha1 = '0081c09917f35565d762c886758dfbdfa1069679',
+  id = 'org.apache.sshd:sshd-core:0.11.0',
+  sha1 = '450da44553c98805ca6bb5709cad54df4acb802a',
   license = 'Apache2.0',
   deps = [':core'],
   exclude = EXCLUDE,