Remove Transform base class

With sufficient squinting, Transform provided an abstract base
interface that covered both cipher modes and compression algorithms.
However it mapped on neither of them particularly well. In addition
this API had the same problem that has made me dislike the Pipe/Filter
API: given a Transform&, what does it do when you put bits in? Maybe
it encrypts. Maybe it compresses. It's a floor wax and a dessert topping!

Currently the Cipher_Mode interface is left mostly unchanged, with the
APIs previously on Transform just moved down the type hierarchy.  I
think there are some definite improvements possible here, wrt handling
of in-place encryption, but left for a later commit.

The compression API is split into two types, Compression_Algorithm and
Decompression_Algorithm. Compression_Algorithm's start() call takes
the compression level, allowing varying compressions with a single
object. And flushing the compression state is moved to a bool param on
`Compression_Algorithm::update`. All the nonsense WRT compression
algorithms having zero length nonces, input granularity rules, etc
as a result of using the Transform interface goes away.

2 files changed, 17 insertions, 17 deletions

diff --git a/src/tests/test_compression.cpp b/src/tests/test_compression.cpp
index fd247803a..d76daf30f 100644
--- a/src/tests/test_compression.cpp
+++ b/src/tests/test_compression.cpp
@@ -66,11 +66,10 @@ class Compression_Tests : public Test
                {
                Test::Result result(algo + " compression");
 
-               std::unique_ptr<Botan::Compressor_Transform> c1(Botan::make_compressor(algo, 1));
-               std::unique_ptr<Botan::Compressor_Transform> c9(Botan::make_compressor(algo, 9));
-               std::unique_ptr<Botan::Compressor_Transform> d(Botan::make_decompressor(algo));
+               std::unique_ptr<Botan::Compression_Algorithm> c(Botan::make_compressor(algo));
+               std::unique_ptr<Botan::Decompression_Algorithm> d(Botan::make_decompressor(algo));
 
-               if(!c1 || !c9 || !d)
+               if(!c || !d)
                   {
                   result.note_missing(algo);
                   continue;
@@ -83,14 +82,14 @@ class Compression_Tests : public Test
                const uint8_t* textb = reinterpret_cast<const uint8_t*>(text_str);
                const Botan::secure_vector<uint8_t> text(textb, textb + text_len);
 
-               const size_t c1_e = run_compression(result, *c1, *d, empty);
-               const size_t c9_e = run_compression(result, *c9, *d, empty);
-               const size_t c1_z = run_compression(result, *c1, *d, all_zeros);
-               const size_t c9_z = run_compression(result, *c9, *d, all_zeros);
-               const size_t c1_r = run_compression(result, *c1, *d, random_binary);
-               const size_t c9_r = run_compression(result, *c9, *d, random_binary);
-               const size_t c1_t = run_compression(result, *c1, *d, text);
-               const size_t c9_t = run_compression(result, *c9, *d, text);
+               const size_t c1_e = run_compression(result, 1, *c, *d, empty);
+               const size_t c9_e = run_compression(result, 9, *c, *d, empty);
+               const size_t c1_z = run_compression(result, 1, *c, *d, all_zeros);
+               const size_t c9_z = run_compression(result, 9, *c, *d, all_zeros);
+               const size_t c1_r = run_compression(result, 1, *c, *d, random_binary);
+               const size_t c9_r = run_compression(result, 9, *c, *d, random_binary);
+               const size_t c1_t = run_compression(result, 1, *c, *d, text);
+               const size_t c9_t = run_compression(result, 9, *c, *d, text);
 
                result.test_gte("Empty input L1 compresses to non-empty output", c1_e, 1);
                result.test_gte("Empty input L9 compresses to non-empty output", c9_e, 1);
@@ -118,13 +117,14 @@ class Compression_Tests : public Test
 
       // Returns # of bytes of compressed message
       size_t run_compression(Test::Result& result,
-                             Botan::Compressor_Transform& c,
-                             Botan::Transform& d,
+                             size_t level,
+                             Botan::Compression_Algorithm& c,
+                             Botan::Decompression_Algorithm& d,
                              const Botan::secure_vector<uint8_t>& msg)
          {
          Botan::secure_vector<uint8_t> compressed = msg;
 
-         c.start();
+         c.start(level);
          c.finish(compressed);
 
          const size_t c_size = compressed.size();
diff --git a/src/tests/test_entropy.cpp b/src/tests/test_entropy.cpp
index 406dc7c41..42d2cf536 100644
--- a/src/tests/test_entropy.cpp
+++ b/src/tests/test_entropy.cpp
@@ -77,7 +77,7 @@ class Entropy_Source_Tests : public Test
                         continue;
                         }
 #endif
-                     std::unique_ptr<Botan::Compressor_Transform> comp(Botan::make_compressor(comp_algo, 9));
+                     std::unique_ptr<Botan::Compression_Algorithm> comp(Botan::make_compressor(comp_algo));
 
                      if(comp)
                         {
@@ -87,7 +87,7 @@ class Entropy_Source_Tests : public Test
                            {
                            Botan::secure_vector<byte> compressed;
                            compressed.assign(entropy.begin(), entropy.end());
-                           comp->start();
+                           comp->start(9);
                            comp->finish(compressed);
 
                            comp1_size = compressed.size();