Remove the bits for supporting compression - it was never actually

supported, and compression can come later on when the overall
architecture is more solid/stable.

2 files changed, 4 insertions, 19 deletions

diff --git a/src/ssl/rec_read.cpp b/src/ssl/rec_read.cpp
index ad28b2dd8..11dedc41c 100644
--- a/src/ssl/rec_read.cpp
+++ b/src/ssl/rec_read.cpp
@@ -17,10 +17,8 @@ namespace Botan {
 */
 void Record_Reader::reset()
    {
-   compress.reset();
    cipher.reset();
    mac.reset();
-   do_compress = false;
    mac_size = pad_amount = 0;
    major = minor = 0;
    seq_no = 0;
@@ -39,15 +37,6 @@ void Record_Reader::set_version(Version_Code version)
    }
 
 /**
-* Set the compression algorithm
-*/
-void Record_Reader::set_compressor(Filter* compressor)
-   {
-   compress.append(compressor);
-   do_compress = true;
-   }
-
-/**
 * Set the keys for reading
 */
 void Record_Reader::set_keys(const CipherSuite& suite, const SessionKeys& keys,
diff --git a/src/ssl/tls_record.h b/src/ssl/tls_record.h
index fa6ed2d17..358051b35 100644
--- a/src/ssl/tls_record.h
+++ b/src/ssl/tls_record.h
@@ -30,24 +30,23 @@ class BOTAN_DLL Record_Writer
       void alert(Alert_Level, Alert_Type);
 
       void set_keys(const CipherSuite&, const SessionKeys&, Connection_Side);
-      void set_compressor(Filter*);
 
       void set_version(Version_Code);
 
       void reset();
 
-      Record_Writer(Socket&);
+      Record_Writer(Socket& socket);
+
    private:
       void send_record(byte, const byte[], u32bit);
       void send_record(byte, byte, byte, const byte[], u32bit);
 
       Socket& socket;
-      Pipe compress, cipher, mac;
+      Pipe cipher, mac;
       SecureVector<byte> buffer;
       u32bit pad_amount, mac_size, buf_pos;
       u64bit seq_no;
       byte major, minor, buf_type;
-      bool do_compress;
    };
 
 /**
@@ -72,8 +71,6 @@ class BOTAN_DLL Record_Reader
                     const SessionKeys& keys,
                     Connection_Side side);
 
-      void set_compressor(Filter* compressor);
-
       void set_version(Version_Code version);
 
       void reset();
@@ -82,11 +79,10 @@ class BOTAN_DLL Record_Reader
    private:
       SecureQueue input_queue;
 
-      Pipe compress, cipher, mac;
+      Pipe cipher, mac;
       u32bit pad_amount, mac_size;
       u64bit seq_no;
       byte major, minor;
-      bool do_compress;
    };
 
 }