5 files changed, 33 insertions, 3 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index bd533dda5..abee53f0a 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-93563703c3acd94883e89baa7fcbf666318e2704
-93563703c3acd94883e89baa7fcbf666318e2704
+6111c39a4ae8f1c62a9312a5f8d8b23adb5f727a
+6111c39a4ae8f1c62a9312a5f8d8b23adb5f727a
 6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874
 6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874
 openssh_7.5p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 5dcf4438e..5010fe0c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ openssh (1:7.5p1-4) UNRELEASED; urgency=medium
     optional.
   * Only call "initctl set-env" from agent-launch if $UPSTART_SESSION is set
     (LP: #1689299).
+  * Fix incoming compression statistics (thanks, Russell Coker; closes:
+    #797964).
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 03 May 2017 12:23:16 +0100
 
diff --git a/debian/patches/fix-incoming-compression-statistics.patch b/debian/patches/fix-incoming-compression-statistics.patch
new file mode 100644
index 000000000..42ebef3fb
--- /dev/null
+++ b/debian/patches/fix-incoming-compression-statistics.patch
@@ -0,0 +1,27 @@
+From 6111c39a4ae8f1c62a9312a5f8d8b23adb5f727a Mon Sep 17 00:00:00 2001
+From: Russell Coker <russell@coker.com.au>
+Date: Tue, 6 Jun 2017 15:00:20 +0100
+Subject: Fix incoming compression statistics
+
+Bug-Debian: https://bugs.debian.org/797964
+Forwarded: https://lists.mindrot.org/pipermail/openssh-unix-dev/2017-June/036077.html
+Last-Update: 2017-06-06
+
+Patch-Name: fix-incoming-compression-statistics.patch
+---
+ packet.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/packet.c b/packet.c
+index 2f3a2ec7..6492b66f 100644
+--- a/packet.c
++++ b/packet.c
+@@ -606,7 +606,7 @@ ssh_packet_close(struct ssh *ssh)
+                                deflateEnd(stream);
+                }
+                if (state->compression_in_started) {
+-                       z_streamp stream = &state->compression_out_stream;
++                       z_streamp stream = &state->compression_in_stream;
+                        debug("compress incoming: "
+                            "raw data %llu, compressed %llu, factor %.2f",
+                            (unsigned long long)stream->total_out,
diff --git a/debian/patches/series b/debian/patches/series
index 981b5cf25..80ad5ec2b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@ no-dsa-host-key-by-default.patch
 restore-authorized_keys2.patch
 s390-missing-header.patch
 x32-syntax-error.patch
+fix-incoming-compression-statistics.patch
diff --git a/packet.c b/packet.c
index 2f3a2ec70..6492b66f9 100644
--- a/packet.c
+++ b/packet.c
@@ -606,7 +606,7 @@ ssh_packet_close(struct ssh *ssh)
                                 deflateEnd(stream);
                 }
                 if (state->compression_in_started) {
-                        z_streamp stream = &state->compression_out_stream;
+                        z_streamp stream = &state->compression_in_stream;
                         debug("compress incoming: "
                             "raw data %llu, compressed %llu, factor %.2f",
                             (unsigned long long)stream->total_out,