tor

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

Handle Zstandard and LZMA in our check for correct guessed compression.

See: https://bugs.torproject.org/21667

Diffstat:
M
src/or/directory.c
 | 
8
++++++++

1 file changed, 8 insertions(+), 0 deletions(-)
diff --git 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