lib-compression: Don't calculate crc32 if using zlib in deflate mode

diff --git a/src/lib-compression/istream-zlib.c b/src/lib-compression/istream-zlib.c
index f5513747244802967feb100254900edad496f987..93b3473071d86e338c1a2a9caba45068963f2c7e 100644 (file)
--- a/src/lib-compression/istream-zlib.c
+++ b/src/lib-compression/istream-zlib.c
@@ -264,9 +264,11 @@ static ssize_t i_stream_zlib_read(struct istream_private *stream)
        ret = inflate(&zstream->zs, Z_SYNC_FLUSH);
 
        out_size -= zstream->zs.avail_out;
-       zstream->crc32 = crc32_data_more(zstream->crc32,
-                                        stream->w_buffer + stream->pos,
-                                        out_size);
+       /* CRC32 is only needed for GZ trailer. */
+       if (zstream->gz)
+               zstream->crc32 = crc32_data_more(zstream->crc32,
+                                                stream->w_buffer + stream->pos,
+                                                out_size);
        stream->pos += out_size;
 
        size_t bytes_consumed = size - zstream->zs.avail_in;

diff --git a/src/lib-compression/ostream-zlib.c b/src/lib-compression/ostream-zlib.c
index 5cc22157376f01f5b5410d2b53b95c212366abe7..ed41f5054f14248a9e35dc00b54ad42cf6a2b540 100644 (file)
--- a/src/lib-compression/ostream-zlib.c
+++ b/src/lib-compression/ostream-zlib.c
@@ -228,7 +228,9 @@ o_stream_zlib_send_chunk(struct zlib_ostream *zstream,
        }
        size -= zs->avail_in;
 
-       zstream->crc = crc32_data_more(zstream->crc, data, size);
+       /* CRC32 is only needed for GZ trailer. */
+       if (zstream->gz)
+               zstream->crc = crc32_data_more(zstream->crc, data, size);
        zstream->bytes32 += size;
        zstream->flushed = FALSE;
        return size;