Add the GOST 34.11 hash function. Pretty slow, but functional.

4 files changed, 237 insertions, 0 deletions

diff --git a/src/engine/def_engine/lookup_hash.cpp b/src/engine/def_engine/lookup_hash.cpp
index 6a0d42dee..f59d4c7e1 100644
--- a/src/engine/def_engine/lookup_hash.cpp
+++ b/src/engine/def_engine/lookup_hash.cpp
@@ -26,6 +26,10 @@
   #include <botan/fork256.h>
 #endif
 
+#if defined(BOTAN_HAS_GOST_34_11)
+  #include <botan/gost_3411.h>
+#endif
+
 #if defined(BOTAN_HAS_HAS_160)
   #include <botan/has160.h>
 #endif
@@ -100,6 +104,11 @@ Default_Engine::find_hash(const SCAN_Name& request,
       return new FORK_256;
 #endif
 
+#if defined(BOTAN_HAS_GOST_34_11)
+   if(request.algo_name() == "GOST-34.11")
+      return new GOST_34_11;
+#endif
+
 #if defined(BOTAN_HAS_HAS_160)
    if(request.algo_name() == "HAS-160")
       return new HAS_160;
diff --git a/src/hash/gost_3411/gost_3411.cpp b/src/hash/gost_3411/gost_3411.cpp
new file mode 100644
index 000000000..25118752f
--- /dev/null
+++ b/src/hash/gost_3411/gost_3411.cpp
@@ -0,0 +1,177 @@
+/*
+* GOST 34.11
+* (C) 2009 Jack Lloyd
+*/
+
+#include <botan/gost_3411.h>
+#include <botan/loadstor.h>
+#include <botan/bit_ops.h>
+#include <botan/xor_buf.h>
+
+namespace Botan {
+
+/**
+* GOST 34.11 Constructor
+*/
+GOST_34_11::GOST_34_11() :
+   HashFunction(32, 32),
+   cipher(GOST_28147_89_Params("R3411_CryptoPro"))
+   {
+   count = 0;
+   position = 0;
+   }
+
+void GOST_34_11::clear() throw()
+   {
+   cipher.clear();
+   sum.clear();
+   hash.clear();
+   count = 0;
+   position = 0;
+   }
+
+/**
+* Hash additional inputs
+*/
+void GOST_34_11::add_data(const byte input[], u32bit length)
+   {
+   count += length;
+
+   if(position)
+      {
+      buffer.copy(position, input, length);
+
+      if(position + length >= HASH_BLOCK_SIZE)
+         {
+         compress_n(buffer.begin(), 1);
+         input += (HASH_BLOCK_SIZE - position);
+         length -= (HASH_BLOCK_SIZE - position);
+         position = 0;
+         }
+      }
+
+   const u32bit full_blocks = length / HASH_BLOCK_SIZE;
+   const u32bit remaining   = length % HASH_BLOCK_SIZE;
+
+   if(full_blocks)
+      compress_n(input, full_blocks);
+
+   buffer.copy(position, input + full_blocks * HASH_BLOCK_SIZE, remaining);
+   position += remaining;
+   }
+
+namespace {
+
+void psi(byte data[32])
+   {
+   byte x = data[0] ^ data[2] ^ data[4] ^ data[6] ^ data[24] ^ data[30];
+   byte y = data[1] ^ data[3] ^ data[5] ^ data[7] ^ data[25] ^ data[31];
+
+   copy_mem(data, data+2, 30);
+   data[30] = x;
+   data[31] = y;
+   }
+
+}
+
+/**
+* The GOST 34.11 compression function
+*/
+void GOST_34_11::compress_n(const byte input[], u32bit blocks)
+   {
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      for(u32bit j = 0, carry = 0; j != 32; ++j)
+         {
+         u16bit s = sum[j] + input[32*i+j] + carry;
+         carry = get_byte(0, s);
+         sum[j] = get_byte(1, s);
+         }
+
+      byte S[32] = { 0 };
+
+      u64bit U[4], V[4];
+
+      for(u32bit j = 0; j != 4; ++j)
+         {
+         U[j] = load_be<u64bit>(hash, j);
+         V[j] = load_be<u64bit>(input + 32*i, j);
+         }
+
+      for(u32bit j = 0; j != 4; ++j)
+         {
+         byte key[32] = { 0 };
+
+         // P transformation
+         for(size_t k = 0; k != 4; ++k)
+            for(size_t l = 0; l != 8; ++l)
+               key[4*l+k] = get_byte(l, U[k]) ^ get_byte(l, V[k]);
+
+         cipher.set_key(key, 32);
+         cipher.encrypt(hash + 8*j, S + 8*j);
+
+         if(j == 3)
+            break;
+
+         // A(x)
+         u64bit A_U = U[0];
+         U[0] = U[1];
+         U[1] = U[2];
+         U[2] = U[3];
+         U[3] = U[0] ^ A_U;
+
+         if(j == 1) // C_3
+            {
+            U[0] ^= 0x00FF00FF00FF00FF;
+            U[1] ^= 0xFF00FF00FF00FF00;
+            U[2] ^= 0x00FFFF00FF0000FF;
+            U[3] ^= 0xFF000000FFFF00FF;
+            }
+
+         // A(A(x))
+         u64bit AA_V_1 = V[0] ^ V[1];
+         u64bit AA_V_2 = V[1] ^ V[2];
+         V[0] = V[2];
+         V[1] = V[3];
+         V[2] = AA_V_1;
+         V[3] = AA_V_2;
+         }
+
+      for(u32bit j = 0; j != 12; ++j)
+         psi(S);
+      xor_buf(S, input + 32*i, 32);
+      psi(S);
+      xor_buf(S, hash, 32);
+      for(u32bit j = 0; j != 61; ++j)
+         psi(S);
+
+      hash.copy(S, 32);
+      }
+   }
+
+/**
+* Produce the final GOST 34.11 output
+*/
+void GOST_34_11::final_result(byte out[])
+   {
+   if(position)
+      {
+      clear_mem(buffer.begin() + position, buffer.size() - position);
+      compress_n(buffer, 1);
+      }
+
+   SecureBuffer<byte, 32> length_buf;
+   const u64bit bit_count = count * 8;
+   store_le(bit_count, length_buf);
+
+   SecureBuffer<byte, 32> sum_buf(sum);
+
+   compress_n(length_buf, 1);
+   compress_n(sum_buf, 1);
+
+   copy_mem(out, hash.begin(), 32);
+
+   clear();
+   }
+
+}
diff --git a/src/hash/gost_3411/gost_3411.h b/src/hash/gost_3411/gost_3411.h
new file mode 100644
index 000000000..c69555052
--- /dev/null
+++ b/src/hash/gost_3411/gost_3411.h
@@ -0,0 +1,41 @@
+/**
+* GOST 34.11
+* (C) 2009 Jack Lloyd
+*/
+
+#ifndef BOTAN_GOST_3411_H__
+#define BOTAN_GOST_3411_H__
+
+#include <botan/hash.h>
+#include <botan/gost_28147.h>
+
+namespace Botan {
+
+/**
+* GOST 34.11
+*/
+class BOTAN_DLL GOST_34_11 : public HashFunction
+   {
+   public:
+      void clear() throw();
+      std::string name() const { return "GOST-R-34.11-94" ; }
+      HashFunction* clone() const { return new GOST_34_11; }
+
+      GOST_34_11();
+   protected:
+      void compress_n(const byte input[], u32bit blocks);
+
+      void add_data(const byte[], u32bit);
+      void final_result(byte[]);
+
+      GOST_28147_89 cipher;
+      SecureBuffer<byte, 32> buffer;
+      SecureBuffer<byte, 32> sum;
+      SecureBuffer<byte, 32> hash;
+      u64bit count;
+      u32bit position;
+   };
+
+}
+
+#endif
diff --git a/src/hash/gost_3411/info.txt b/src/hash/gost_3411/info.txt
new file mode 100644
index 000000000..ef2879823
--- /dev/null
+++ b/src/hash/gost_3411/info.txt
@@ -0,0 +1,10 @@
+realname "GOST 34.11"
+
+define GOST_34_11
+
+load_on auto
+
+<add>
+gost_3411.cpp
+gost_3411.h
+</add>