Cleanups/random changes in the stream cipher code:

Remove encrypt, decrypt - replace by cipher() and cipher1()

Remove seek() - not well supported/tested, I want to redo with a new interface
once CTR and OFB modes become stream ciphers.

Rename resync to set_iv()

Remove StreamCipher::IV_LENGTH and add StreamCipher::valid_iv_length() to
allow multiple IV lengths (as for instance Turing allows, as would Salsa20
if XSalsa20 were supported).

2 files changed, 12 insertions, 7 deletions

diff --git a/src/stream/wid_wake/wid_wake.cpp b/src/stream/wid_wake/wid_wake.cpp
index 1dc0fd7f9..56f938fac 100644
--- a/src/stream/wid_wake/wid_wake.cpp
+++ b/src/stream/wid_wake/wid_wake.cpp
@@ -110,16 +110,17 @@ void WiderWake_41_BE::key_schedule(const byte key[], u32bit)
    T[X] = Z;
 
    position = 0;
-   const byte iv[8] = { 0 };
-   resync(iv, 8);
+
+   const byte ZEROS[8] = { 0 };
+   set_iv(ZEROS, sizeof(ZEROS));
    }
 
 /*
 * Resynchronization
 */
-void WiderWake_41_BE::resync(const byte iv[], u32bit length)
+void WiderWake_41_BE::set_iv(const byte iv[], u32bit length)
    {
-   if(length != 8)
+   if(!valid_iv_length(length))
       throw Invalid_IV_Length(name(), length);
 
    for(u32bit j = 0; j != 4; ++j)
diff --git a/src/stream/wid_wake/wid_wake.h b/src/stream/wid_wake/wid_wake.h
index 4720afdb2..a037a056e 100644
--- a/src/stream/wid_wake/wid_wake.h
+++ b/src/stream/wid_wake/wid_wake.h
@@ -18,14 +18,18 @@ namespace Botan {
 class BOTAN_DLL WiderWake_41_BE : public StreamCipher
    {
    public:
+      void cipher(const byte[], byte[], u32bit);
+      void set_iv(const byte[], u32bit);
+
+      bool valid_iv_length(u32bit iv_len) const
+         { return (iv_len == 8); }
+
       void clear() throw();
       std::string name() const { return "WiderWake4+1-BE"; }
       StreamCipher* clone() const { return new WiderWake_41_BE; }
-      WiderWake_41_BE() : StreamCipher(16, 16, 1, 8) {}
+      WiderWake_41_BE() : StreamCipher(16, 16, 1) {}
    private:
-      void cipher(const byte[], byte[], u32bit);
       void key_schedule(const byte[], u32bit);
-      void resync(const byte[], u32bit);
 
       void generate(u32bit);