Split ciphers into block and stream ciphers. Move base class headers

3 files changed, 160 insertions, 0 deletions

diff --git a/src/block/lubyrack/info.txt b/src/block/lubyrack/info.txt
new file mode 100644
index 000000000..d83df2409
--- /dev/null
+++ b/src/block/lubyrack/info.txt
@@ -0,0 +1,10 @@
+realname "Luby-Rackoff"
+
+define LUBY_RACKOFF
+
+load_on auto
+
+<add>
+lubyrack.cpp
+lubyrack.h
+</add>
diff --git a/src/block/lubyrack/lubyrack.cpp b/src/block/lubyrack/lubyrack.cpp
new file mode 100644
index 000000000..c9e6fc531
--- /dev/null
+++ b/src/block/lubyrack/lubyrack.cpp
@@ -0,0 +1,114 @@
+/*************************************************
+* Luby-Rackoff Source File                       *
+* (C) 1999-2008 Jack Lloyd                       *
+*************************************************/
+
+#include <botan/lubyrack.h>
+#include <botan/xor_buf.h>
+
+namespace Botan {
+
+/*************************************************
+* Luby-Rackoff Encryption                        *
+*************************************************/
+void LubyRackoff::enc(const byte in[], byte out[]) const
+   {
+   const u32bit len = hash->OUTPUT_LENGTH;
+
+   SecureVector<byte> buffer(len);
+   hash->update(K1);
+   hash->update(in, len);
+   hash->final(buffer);
+   xor_buf(out + len, in + len, buffer, len);
+
+   hash->update(K2);
+   hash->update(out + len, len);
+   hash->final(buffer);
+   xor_buf(out, in, buffer, len);
+
+   hash->update(K1);
+   hash->update(out, len);
+   hash->final(buffer);
+   xor_buf(out + len, buffer, len);
+
+   hash->update(K2);
+   hash->update(out + len, len);
+   hash->final(buffer);
+   xor_buf(out, buffer, len);
+   }
+
+/*************************************************
+* Luby-Rackoff Decryption                        *
+*************************************************/
+void LubyRackoff::dec(const byte in[], byte out[]) const
+   {
+   const u32bit len = hash->OUTPUT_LENGTH;
+
+   SecureVector<byte> buffer(len);
+   hash->update(K2);
+   hash->update(in + len, len);
+   hash->final(buffer);
+   xor_buf(out, in, buffer, len);
+
+   hash->update(K1);
+   hash->update(out, len);
+   hash->final(buffer);
+   xor_buf(out + len, in + len, buffer, len);
+
+   hash->update(K2);
+   hash->update(out + len, len);
+   hash->final(buffer);
+   xor_buf(out, buffer, len);
+
+   hash->update(K1);
+   hash->update(out, len);
+   hash->final(buffer);
+   xor_buf(out + len, buffer, len);
+   }
+
+/*************************************************
+* Luby-Rackoff Key Schedule                      *
+*************************************************/
+void LubyRackoff::key(const byte key[], u32bit length)
+   {
+   K1.set(key, length / 2);
+   K2.set(key + length / 2, length / 2);
+   }
+
+/*************************************************
+* Clear memory of sensitive data                 *
+*************************************************/
+void LubyRackoff::clear() throw()
+   {
+   K1.clear();
+   K2.clear();
+   hash->clear();
+   }
+
+/*************************************************
+* Return a clone of this object                  *
+*************************************************/
+BlockCipher* LubyRackoff::clone() const
+   {
+   return new LubyRackoff(hash->clone());
+   }
+
+/*************************************************
+* Return the name of this type                   *
+*************************************************/
+std::string LubyRackoff::name() const
+   {
+   return "Luby-Rackoff(" + hash->name() + ")";
+   }
+
+/*************************************************
+* Luby-Rackoff Constructor                       *
+*************************************************/
+LubyRackoff::LubyRackoff(HashFunction* h) :
+   BlockCipher(2 * (h ? h->OUTPUT_LENGTH: 0),
+               2, 32, 2),
+   hash(h)
+   {
+   }
+
+}
diff --git a/src/block/lubyrack/lubyrack.h b/src/block/lubyrack/lubyrack.h
new file mode 100644
index 000000000..ba5a4d052
--- /dev/null
+++ b/src/block/lubyrack/lubyrack.h
@@ -0,0 +1,36 @@
+/*************************************************
+* Luby-Rackoff Header File                       *
+* (C) 1999-2008 Jack Lloyd                       *
+*************************************************/
+
+#ifndef BOTAN_LUBY_RACKOFF_H__
+#define BOTAN_LUBY_RACKOFF_H__
+
+#include <botan/block_cipher.h>
+#include <botan/hash.h>
+
+namespace Botan {
+
+/*************************************************
+* Luby-Rackoff                                   *
+*************************************************/
+class BOTAN_DLL LubyRackoff : public BlockCipher
+   {
+   public:
+      void clear() throw();
+      std::string name() const;
+      BlockCipher* clone() const;
+
+      LubyRackoff(HashFunction* hash);
+      ~LubyRackoff() { delete hash; }
+   private:
+      void enc(const byte[], byte[]) const;
+      void dec(const byte[], byte[]) const;
+      void key(const byte[], u32bit);
+      HashFunction* hash;
+      SecureVector<byte> K1, K2;
+   };
+
+}
+
+#endif