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

4 files changed, 250 insertions, 0 deletions

diff --git a/modules/mac/ssl3mac/ssl3_mac.cpp b/modules/mac/ssl3mac/ssl3_mac.cpp
new file mode 100644
index 000000000..ceb04bf44
--- /dev/null
+++ b/modules/mac/ssl3mac/ssl3_mac.cpp
@@ -0,0 +1,88 @@
+/*************************************************
+* SSL3-MAC Source File                           *
+* (C) 1999-2004 Jack Lloyd                       *
+*************************************************/
+
+#include <botan/ssl3_mac.h>
+#include <botan/lookup.h>
+
+namespace Botan {
+
+/*************************************************
+* Update a SSL3-MAC Calculation                  *
+*************************************************/
+void SSL3_MAC::add_data(const byte input[], u32bit length)
+   {
+   hash->update(input, length);
+   }
+
+/*************************************************
+* Finalize a SSL3-MAC Calculation                *
+*************************************************/
+void SSL3_MAC::final_result(byte mac[])
+   {
+   hash->final(mac);
+   hash->update(o_key);
+   hash->update(mac, OUTPUT_LENGTH);
+   hash->final(mac);
+   hash->update(i_key);
+   }
+
+/*************************************************
+* SSL3-MAC Key Schedule                          *
+*************************************************/
+void SSL3_MAC::key(const byte key[], u32bit length)
+   {
+   hash->clear();
+   std::fill(i_key.begin(), i_key.end(), 0x36);
+   std::fill(o_key.begin(), o_key.end(), 0x5C);
+
+   i_key.copy(key, length);
+   o_key.copy(key, length);
+   hash->update(i_key);
+   }
+
+/*************************************************
+* Clear memory of sensitive data                 *
+*************************************************/
+void SSL3_MAC::clear() throw()
+   {
+   hash->clear();
+   i_key.clear();
+   o_key.clear();
+   }
+
+/*************************************************
+* Return the name of this type                   *
+*************************************************/
+std::string SSL3_MAC::name() const
+   {
+   return "SSL3-MAC(" + hash->name() + ")";
+   }
+
+/*************************************************
+* Return a clone of this object                  *
+*************************************************/
+MessageAuthenticationCode* SSL3_MAC::clone() const
+   {
+   return new SSL3_MAC(hash->name());
+   }
+
+/*************************************************
+* SSL3-MAC Constructor                           *
+*************************************************/
+SSL3_MAC::SSL3_MAC(const std::string& hash_name) :
+   MessageAuthenticationCode(output_length_of(hash_name),
+                             output_length_of(hash_name)),
+   hash(get_hash(hash_name))
+   {
+   if(hash->name() != "MD5" && hash->name() != "SHA-160")
+      throw Invalid_Argument("SSL3-MAC cannot be used with " + hash->name());
+
+   const u32bit INNER_HASH_LENGTH = (hash->name() == "MD5") ? 64 : 60;
+
+   i_key.create(INNER_HASH_LENGTH);
+   o_key.create(INNER_HASH_LENGTH);
+   }
+
+}
diff --git a/modules/mac/ssl3mac/ssl3_mac.h b/modules/mac/ssl3mac/ssl3_mac.h
new file mode 100644
index 000000000..8ab08c97d
--- /dev/null
+++ b/modules/mac/ssl3mac/ssl3_mac.h
@@ -0,0 +1,34 @@
+/*************************************************
+* 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/modules/mac/x919_mac/x919_mac.cpp b/modules/mac/x919_mac/x919_mac.cpp
new file mode 100644
index 000000000..92ec7b7b8
--- /dev/null
+++ b/modules/mac/x919_mac/x919_mac.cpp
@@ -0,0 +1,92 @@
+/*************************************************
+* ANSI X9.19 MAC Source File                     *
+* (C) 1999-2007 Jack Lloyd                       *
+*************************************************/
+
+#include <botan/x919_mac.h>
+#include <botan/lookup.h>
+#include <botan/xor_buf.h>
+#include <algorithm>
+
+namespace Botan {
+
+/*************************************************
+* Update an ANSI X9.19 MAC Calculation           *
+*************************************************/
+void ANSI_X919_MAC::add_data(const byte input[], u32bit length)
+   {
+   u32bit xored = std::min(8 - position, length);
+   xor_buf(state + position, input, xored);
+   position += xored;
+
+   if(position < 8) return;
+
+   e->encrypt(state);
+   input += xored;
+   length -= xored;
+   while(length >= 8)
+      {
+      xor_buf(state, input, 8);
+      e->encrypt(state);
+      input += 8;
+      length -= 8;
+      }
+
+   xor_buf(state, input, length);
+   position = length;
+   }
+
+/*************************************************
+* Finalize an ANSI X9.19 MAC Calculation         *
+*************************************************/
+void ANSI_X919_MAC::final_result(byte mac[])
+   {
+   if(position)
+      e->encrypt(state);
+   d->decrypt(state, mac);
+   e->encrypt(mac);
+   state.clear();
+   position = 0;
+   }
+
+/*************************************************
+* ANSI X9.19 MAC Key Schedule                    *
+*************************************************/
+void ANSI_X919_MAC::key(const byte key[], u32bit length)
+   {
+   e->set_key(key, 8);
+   if(length == 8) d->set_key(key, 8);
+   else            d->set_key(key + 8, 8);
+   }
+
+/*************************************************
+* Clear memory of sensitive data                 *
+*************************************************/
+void ANSI_X919_MAC::clear() throw()
+   {
+   e->clear();
+   d->clear();
+   state.clear();
+   position = 0;
+   }
+
+/*************************************************
+* ANSI X9.19 MAC Constructor                     *
+*************************************************/
+ANSI_X919_MAC::ANSI_X919_MAC() : MessageAuthenticationCode(8, 8, 16, 8)
+   {
+   e = get_block_cipher("DES");
+   d = get_block_cipher("DES");
+   position = 0;
+   }
+
+/*************************************************
+* ANSI X9.19 MAC Destructor                      *
+*************************************************/
+ANSI_X919_MAC::~ANSI_X919_MAC()
+   {
+   delete e;
+   delete d;
+   }
+
+}
diff --git a/modules/mac/x919_mac/x919_mac.h b/modules/mac/x919_mac/x919_mac.h
new file mode 100644
index 000000000..bedb2cf58
--- /dev/null
+++ b/modules/mac/x919_mac/x919_mac.h
@@ -0,0 +1,36 @@
+/*************************************************
+* 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