Shuffle things around. Add NIST X.509 test to build.

3 files changed, 0 insertions, 184 deletions

diff --git a/src/block/lubyrack/info.txt b/src/block/lubyrack/info.txt
deleted file mode 100644
index 1d83a0bac..000000000
--- a/src/block/lubyrack/info.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-define LUBY_RACKOFF 20131128
-
-<requires>
-hash
-</requires>
diff --git a/src/block/lubyrack/lubyrack.cpp b/src/block/lubyrack/lubyrack.cpp
deleted file mode 100644
index 9be079003..000000000
--- a/src/block/lubyrack/lubyrack.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-* Luby-Rackoff
-* (C) 1999-2008 Jack Lloyd
-*
-* Distributed under the terms of the Botan license
-*/
-
-#include <botan/lubyrack.h>
-#include <botan/internal/xor_buf.h>
-
-namespace Botan {
-
-/*
-* Luby-Rackoff Encryption
-*/
-void LubyRackoff::encrypt_n(const byte in[], byte out[], size_t blocks) const
-   {
-   const size_t len = hash->output_length();
-
-   secure_vector<byte> buffer_vec(len);
-   byte* buffer = &buffer_vec[0];
-
-   for(size_t i = 0; i != blocks; ++i)
-      {
-      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);
-
-      in += 2 * len;
-      out += 2 * len;
-      }
-   }
-
-/*
-* Luby-Rackoff Decryption
-*/
-void LubyRackoff::decrypt_n(const byte in[], byte out[], size_t blocks) const
-   {
-   const size_t len = hash->output_length();
-
-   secure_vector<byte> buffer_vec(len);
-   byte* buffer = &buffer_vec[0];
-
-   for(size_t i = 0; i != blocks; ++i)
-      {
-      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);
-
-      in += 2 * len;
-      out += 2 * len;
-      }
-   }
-
-/*
-* Luby-Rackoff Key Schedule
-*/
-void LubyRackoff::key_schedule(const byte key[], size_t length)
-   {
-   K1.assign(key, key + (length / 2));
-   K2.assign(key + (length / 2), key + length);
-   }
-
-/*
-* Clear memory of sensitive data
-*/
-void LubyRackoff::clear()
-   {
-   zap(K1);
-   zap(K2);
-   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) : hash(h)
-   {
-   }
-
-}
diff --git a/src/block/lubyrack/lubyrack.h b/src/block/lubyrack/lubyrack.h
deleted file mode 100644
index e28c60be7..000000000
--- a/src/block/lubyrack/lubyrack.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* Luby-Rackoff
-* (C) 1999-2008 Jack Lloyd
-*
-* Distributed under the terms of the Botan license
-*/
-
-#ifndef BOTAN_LUBY_RACKOFF_H__
-#define BOTAN_LUBY_RACKOFF_H__
-
-#include <botan/block_cipher.h>
-#include <botan/hash.h>
-
-namespace Botan {
-
-/**
-* Luby-Rackoff block cipher construction
-*/
-class BOTAN_DLL LubyRackoff : public BlockCipher
-   {
-   public:
-      void encrypt_n(const byte in[], byte out[], size_t blocks) const;
-      void decrypt_n(const byte in[], byte out[], size_t blocks) const;
-
-      size_t block_size() const { return 2 * hash->output_length(); }
-
-      Key_Length_Specification key_spec() const
-         {
-         return Key_Length_Specification(2, 32, 2);
-         }
-
-      void clear();
-      std::string name() const;
-      BlockCipher* clone() const;
-
-      /**
-      * @param hash function to use to form the block cipher
-      */
-      LubyRackoff(HashFunction* hash);
-      ~LubyRackoff() { delete hash; }
-   private:
-      void key_schedule(const byte[], size_t);
-
-      HashFunction* hash;
-      secure_vector<byte> K1, K2;
-   };
-
-}
-
-#endif