diff options
author | Jack Lloyd <[email protected]> | 2016-04-12 23:03:14 -0400 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2016-04-21 09:18:54 -0400 |
commit | 8b85b7805151ab8fce5ac9d214c71c4eeb3d6075 (patch) | |
tree | 40cbc2af481dfc2f84e32330308523a5e8f68e44 /src/tests/test_entropy.cpp | |
parent | a4358c96a0de1ab7afc0b437ab79bfc35f2e1824 (diff) |
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.
Diffstat (limited to 'src/tests/test_entropy.cpp')
-rw-r--r-- | src/tests/test_entropy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |