3 files changed, 23 insertions, 51 deletions
diff --git a/src/lib/compression/zlib/info.txt b/src/lib/compression/zlib/info.txt
index 8b722350f..6c82c49a3 100644
--- a/src/lib/compression/zlib/info.txt
+++ b/src/lib/compression/zlib/info.txt
@@ -1,4 +1,4 @@
-define ZLIB_TRANSFORM 20141118
+define ZLIB 20160412
 
 load_on vendor
 
diff --git a/src/lib/compression/zlib/zlib.cpp b/src/lib/compression/zlib/zlib.cpp
index 6df5ee931..836925a68 100644
--- a/src/lib/compression/zlib/zlib.cpp
+++ b/src/lib/compression/zlib/zlib.cpp
@@ -50,20 +50,25 @@ class Zlib_Compression_Stream : public Zlib_Stream
          {
          wbits = compute_window_bits(wbits, wbits_offset);
 
-         int rc = deflateInit2(streamp(), level, Z_DEFLATED, wbits,
-                               8, Z_DEFAULT_STRATEGY);
+         if(level >= 9)
+            level = 9;
+         else if(level == 0)
+            level = 6;
+
+         int rc = ::deflateInit2(streamp(), level, Z_DEFLATED, wbits, 8, Z_DEFAULT_STRATEGY);
+
          if(rc != Z_OK)
             throw Exception("zlib deflate initialization failed");
          }
 
       ~Zlib_Compression_Stream()
          {
-         deflateEnd(streamp());
+         ::deflateEnd(streamp());
          }
 
       bool run(u32bit flags) override
          {
-         int rc = deflate(streamp(), flags);
+         int rc = ::deflate(streamp(), flags);
 
          if(rc == Z_MEM_ERROR)
             throw Exception("zlib memory allocation failure");
@@ -79,7 +84,7 @@ class Zlib_Decompression_Stream : public Zlib_Stream
    public:
       Zlib_Decompression_Stream(int wbits, int wbits_offset = 0)
          {
-         int rc = inflateInit2(streamp(), compute_window_bits(wbits, wbits_offset));
+         int rc = ::inflateInit2(streamp(), compute_window_bits(wbits, wbits_offset));
 
          if(rc == Z_MEM_ERROR)
             throw Exception("zlib memory allocation failure");
@@ -89,12 +94,12 @@ class Zlib_Decompression_Stream : public Zlib_Stream
 
       ~Zlib_Decompression_Stream()
          {
-         inflateEnd(streamp());
+         ::inflateEnd(streamp());
          }
 
       bool run(u32bit flags) override
          {
-         int rc = inflate(streamp(), flags);
+         int rc = ::inflate(streamp(), flags);
 
          if(rc == Z_MEM_ERROR)
             throw Exception("zlib memory allocation failure");
@@ -145,9 +150,9 @@ class Gzip_Decompression_Stream : public Zlib_Decompression_Stream
 
 }
 
-Compression_Stream* Zlib_Compression::make_stream() const
+Compression_Stream* Zlib_Compression::make_stream(size_t level) const
    {
-   return new Zlib_Compression_Stream(m_level, 15);
+   return new Zlib_Compression_Stream(level, 15);
    }
 
 Compression_Stream* Zlib_Decompression::make_stream() const
@@ -155,9 +160,9 @@ Compression_Stream* Zlib_Decompression::make_stream() const
    return new Zlib_Decompression_Stream(15);
    }
 
-Compression_Stream* Deflate_Compression::make_stream() const
+Compression_Stream* Deflate_Compression::make_stream(size_t level) const
    {
-   return new Deflate_Compression_Stream(m_level, 15);
+   return new Deflate_Compression_Stream(level, 15);
    }
 
 Compression_Stream* Deflate_Decompression::make_stream() const
@@ -165,9 +170,9 @@ Compression_Stream* Deflate_Decompression::make_stream() const
    return new Deflate_Decompression_Stream(15);
    }
 
-Compression_Stream* Gzip_Compression::make_stream() const
+Compression_Stream* Gzip_Compression::make_stream(size_t level) const
    {
-   return new Gzip_Compression_Stream(m_level, 15, m_os_code);
+   return new Gzip_Compression_Stream(level, 15, m_os_code);
    }
 
 Compression_Stream* Gzip_Decompression::make_stream() const
diff --git a/src/lib/compression/zlib/zlib.h b/src/lib/compression/zlib/zlib.h
index 6a8cead14..0cedb1eab 100644
--- a/src/lib/compression/zlib/zlib.h
+++ b/src/lib/compression/zlib/zlib.h
@@ -19,20 +19,9 @@ namespace Botan {
 class BOTAN_DLL Zlib_Compression final : public Stream_Compression
    {
    public:
-      /**
-      * @param level how much effort to use on compressing (0 to 9);
-      *        higher levels are slower but tend to give better
-      *        compression
-      */
-
-      Zlib_Compression(size_t level = 6) : m_level(level) {}
-
       std::string name() const override { return "Zlib_Compression"; }
-
    private:
-      Compression_Stream* make_stream() const override;
-
-      const size_t m_level;
+      Compression_Stream* make_stream(size_t level) const override;
    };
 
 /**
@@ -42,7 +31,6 @@ class BOTAN_DLL Zlib_Decompression final : public Stream_Decompression
    {
    public:
       std::string name() const override { return "Zlib_Decompression"; }
-
    private:
       Compression_Stream* make_stream() const override;
    };
@@ -53,19 +41,9 @@ class BOTAN_DLL Zlib_Decompression final : public Stream_Decompression
 class BOTAN_DLL Deflate_Compression final : public Stream_Compression
    {
    public:
-      /**
-      * @param level how much effort to use on compressing (0 to 9);
-      *        higher levels are slower but tend to give better
-      *        compression
-      */
-      Deflate_Compression(size_t level = 6) : m_level(level) {}
-
       std::string name() const override { return "Deflate_Compression"; }
-
    private:
-      Compression_Stream* make_stream() const override;
-
-      const size_t m_level;
+      Compression_Stream* make_stream(size_t level) const override;
    };
 
 /**
@@ -75,7 +53,6 @@ class BOTAN_DLL Deflate_Decompression final : public Stream_Decompression
    {
    public:
       std::string name() const override { return "Deflate_Decompression"; }
-
    private:
       Compression_Stream* make_stream() const override;
    };
@@ -86,20 +63,11 @@ class BOTAN_DLL Deflate_Decompression final : public Stream_Decompression
 class BOTAN_DLL Gzip_Compression final : public Stream_Compression
    {
    public:
-      /**
-      * @param level how much effort to use on compressing (0 to 9);
-      *        higher levels are slower but tend to give better
-      *        compression
-      */
-      Gzip_Compression(size_t level = 6, byte os_code = 255) :
-         m_level(level), m_os_code(os_code) {}
+      Gzip_Compression(byte os_code = 255) : m_os_code(os_code) {}
 
       std::string name() const override { return "Gzip_Compression"; }
-
    private:
-      Compression_Stream* make_stream() const override;
-
-      const size_t m_level;
+      Compression_Stream* make_stream(size_t level) const override;
       const byte m_os_code;
    };
 
@@ -110,7 +78,6 @@ class BOTAN_DLL Gzip_Decompression final : public Stream_Decompression
    {
    public:
       std::string name() const override { return "Gzip_Decompression"; }
-
    private:
       Compression_Stream* make_stream() const override;
    };