Modularize SSLv3 MAC and X9.19 MACs. Fix some feature macro inconsistencies.

2 files changed, 0 insertions, 70 deletions

diff --git a/include/ssl3_mac.h b/include/ssl3_mac.h
deleted file mode 100644
index 8ab08c97d..000000000
--- a/include/ssl3_mac.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************
-* SSL3-MAC Header File                           *
-* (C) 1999-2004 Jack Lloyd                       *
-*************************************************/
-
-#ifndef BOTAN_SSL3_MAC_H__
-#define BOTAN_SSL3_MAC_H__
-
-#include <botan/base.h>
-
-namespace Botan {
-
-/*************************************************
-* SSL3-MAC                                       *
-*************************************************/
-class SSL3_MAC : public MessageAuthenticationCode
-   {
-   public:
-      void clear() throw();
-      std::string name() const;
-      MessageAuthenticationCode* clone() const;
-      SSL3_MAC(const std::string&);
-      ~SSL3_MAC() { delete hash; }
-   private:
-      void add_data(const byte[], u32bit);
-      void final_result(byte[]);
-      void key(const byte[], u32bit);
-      HashFunction* hash;
-      SecureVector<byte> i_key, o_key;
-   };
-
-}
-
-#endif
diff --git a/include/x919_mac.h b/include/x919_mac.h
deleted file mode 100644
index bedb2cf58..000000000
--- a/include/x919_mac.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*************************************************
-* ANSI X9.19 MAC Header File                     *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
-
-#ifndef BOTAN_ANSI_X919_MAC_H__
-#define BOTAN_ANSI_X919_MAC_H__
-
-#include <botan/base.h>
-
-namespace Botan {
-
-/*************************************************
-* ANSI X9.19 MAC                                 *
-*************************************************/
-class BOTAN_DLL ANSI_X919_MAC : public MessageAuthenticationCode
-   {
-   public:
-      void clear() throw();
-      std::string name() const { return "X9.19-MAC"; }
-      MessageAuthenticationCode* clone() const { return new ANSI_X919_MAC; }
-      ANSI_X919_MAC();
-      ~ANSI_X919_MAC();
-   private:
-      void add_data(const byte[], u32bit);
-      void final_result(byte[]);
-      void key(const byte[], u32bit);
-      BlockCipher* e;
-      BlockCipher* d;
-      SecureBuffer<byte, 8> state;
-      u32bit position;
-   };
-
-}
-
-#endif