[tor-commits] [tor/master] Handle Zstandard and LZMA in our check for correct guessed compression.

[nickm at torproject.org]

commit 61b6de5906b92fa1354efe60aa1506ab215d60b3
Author: Alexander Færøy <ahf at torproject.org>
Date:   Mon May 8 14:00:44 2017 +0200

    Handle Zstandard and LZMA in our check for correct guessed compression.
    
    See: https://bugs.torproject.org/21667
---
 src/or/directory.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/or/directory.c b/src/or/directory.c
index c7c3d38..3df5be9 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2309,6 +2309,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
         description1 = "as deflated";
       else if (compression == GZIP_METHOD)
         description1 = "as gzipped";
+      else if (compression == ZSTD_METHOD)
+        description1 = "as Zstandard compressed";
+      else if (compression == LZMA_METHOD)
+        description1 = "as LZMA compressed";
       else if (compression == NO_METHOD)
         description1 = "as uncompressed";
       else
@@ -2317,6 +2321,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
         description2 = "deflated";
       else if (guessed == GZIP_METHOD)
         description2 = "gzipped";
+      else if (guessed == ZSTD_METHOD)
+        description2 = "Zstandard compressed";
+      else if (guessed == LZMA_METHOD)
+        description2 = "LZMA compressed";
       else if (!plausible)
         description2 = "confusing binary junk";
       else