Split SHA-2 into 32 and 64 bit versions; they are totally independent

of each other anyway.

3 files changed, 290 insertions, 0 deletions

diff --git a/src/hash/sha2_32/info.txt b/src/hash/sha2_32/info.txt
new file mode 100644
index 000000000..2f0b8a7ee
--- /dev/null
+++ b/src/hash/sha2_32/info.txt
@@ -0,0 +1,5 @@
+define SHA2_32
+
+<requires>
+mdx_hash
+</requires>
diff --git a/src/hash/sha2_32/sha2_32.cpp b/src/hash/sha2_32/sha2_32.cpp
new file mode 100644
index 000000000..acd06061e
--- /dev/null
+++ b/src/hash/sha2_32/sha2_32.cpp
@@ -0,0 +1,229 @@
+/*
+* SHA-{224,256}
+* (C) 1999-2010 Jack Lloyd
+*     2007 FlexSecure GmbH
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/sha2_32.h>
+#include <botan/loadstor.h>
+#include <botan/rotate.h>
+
+namespace Botan {
+
+namespace {
+
+/*
+* SHA-256 Rho Function
+*/
+inline u32bit rho(u32bit X, u32bit rot1, u32bit rot2, u32bit rot3)
+   {
+   return (rotate_right(X, rot1) ^ rotate_right(X, rot2) ^
+           rotate_right(X, rot3));
+   }
+
+/*
+* SHA-256 Sigma Function
+*/
+inline u32bit sigma(u32bit X, u32bit rot1, u32bit rot2, u32bit shift)
+   {
+   return (rotate_right(X, rot1) ^ rotate_right(X, rot2) ^ (X >> shift));
+   }
+
+/*
+* SHA-256 F1 Function
+*/
+inline void F1(u32bit A, u32bit B, u32bit C, u32bit& D,
+               u32bit E, u32bit F, u32bit G, u32bit& H,
+               u32bit msg, u32bit magic)
+   {
+   H += magic + rho(E, 6, 11, 25) + ((E & F) ^ (~E & G)) + msg;
+   D += H;
+   H += rho(A, 2, 13, 22) + ((A & B) | ((A | B) & C));
+   }
+
+/*
+* SHA-224 / SHA-256 compression function
+*/
+void sha2_32_compress(MemoryRegion<u32bit>& W,
+                      MemoryRegion<u32bit>& digest,
+                      const byte input[], u32bit blocks)
+   {
+   u32bit A = digest[0], B = digest[1], C = digest[2],
+          D = digest[3], E = digest[4], F = digest[5],
+          G = digest[6], H = digest[7];
+
+   for(u32bit i = 0; i != blocks; ++i)
+      {
+      load_be(&W[0], input, 16);
+
+      for(u32bit j = 16; j != 64; j += 8)
+         {
+         W[j  ] = sigma(W[j- 2], 17, 19, 10) + W[j-7] +
+                  sigma(W[j-15],  7, 18,  3) + W[j-16];
+         W[j+1] = sigma(W[j- 1], 17, 19, 10) + W[j-6] +
+                  sigma(W[j-14],  7, 18,  3) + W[j-15];
+         W[j+2] = sigma(W[j   ], 17, 19, 10) + W[j-5] +
+                  sigma(W[j-13],  7, 18,  3) + W[j-14];
+         W[j+3] = sigma(W[j+ 1], 17, 19, 10) + W[j-4] +
+                  sigma(W[j-12],  7, 18,  3) + W[j-13];
+         W[j+4] = sigma(W[j+ 2], 17, 19, 10) + W[j-3] +
+                  sigma(W[j-11],  7, 18,  3) + W[j-12];
+         W[j+5] = sigma(W[j+ 3], 17, 19, 10) + W[j-2] +
+                  sigma(W[j-10],  7, 18,  3) + W[j-11];
+         W[j+6] = sigma(W[j+ 4], 17, 19, 10) + W[j-1] +
+                  sigma(W[j- 9],  7, 18,  3) + W[j-10];
+         W[j+7] = sigma(W[j+ 5], 17, 19, 10) + W[j  ] +
+                  sigma(W[j- 8],  7, 18,  3) + W[j- 9];
+         }
+
+      F1(A, B, C, D, E, F, G, H, W[ 0], 0x428A2F98);
+      F1(H, A, B, C, D, E, F, G, W[ 1], 0x71374491);
+      F1(G, H, A, B, C, D, E, F, W[ 2], 0xB5C0FBCF);
+      F1(F, G, H, A, B, C, D, E, W[ 3], 0xE9B5DBA5);
+      F1(E, F, G, H, A, B, C, D, W[ 4], 0x3956C25B);
+      F1(D, E, F, G, H, A, B, C, W[ 5], 0x59F111F1);
+      F1(C, D, E, F, G, H, A, B, W[ 6], 0x923F82A4);
+      F1(B, C, D, E, F, G, H, A, W[ 7], 0xAB1C5ED5);
+      F1(A, B, C, D, E, F, G, H, W[ 8], 0xD807AA98);
+      F1(H, A, B, C, D, E, F, G, W[ 9], 0x12835B01);
+      F1(G, H, A, B, C, D, E, F, W[10], 0x243185BE);
+      F1(F, G, H, A, B, C, D, E, W[11], 0x550C7DC3);
+      F1(E, F, G, H, A, B, C, D, W[12], 0x72BE5D74);
+      F1(D, E, F, G, H, A, B, C, W[13], 0x80DEB1FE);
+      F1(C, D, E, F, G, H, A, B, W[14], 0x9BDC06A7);
+      F1(B, C, D, E, F, G, H, A, W[15], 0xC19BF174);
+      F1(A, B, C, D, E, F, G, H, W[16], 0xE49B69C1);
+      F1(H, A, B, C, D, E, F, G, W[17], 0xEFBE4786);
+      F1(G, H, A, B, C, D, E, F, W[18], 0x0FC19DC6);
+      F1(F, G, H, A, B, C, D, E, W[19], 0x240CA1CC);
+      F1(E, F, G, H, A, B, C, D, W[20], 0x2DE92C6F);
+      F1(D, E, F, G, H, A, B, C, W[21], 0x4A7484AA);
+      F1(C, D, E, F, G, H, A, B, W[22], 0x5CB0A9DC);
+      F1(B, C, D, E, F, G, H, A, W[23], 0x76F988DA);
+      F1(A, B, C, D, E, F, G, H, W[24], 0x983E5152);
+      F1(H, A, B, C, D, E, F, G, W[25], 0xA831C66D);
+      F1(G, H, A, B, C, D, E, F, W[26], 0xB00327C8);
+      F1(F, G, H, A, B, C, D, E, W[27], 0xBF597FC7);
+      F1(E, F, G, H, A, B, C, D, W[28], 0xC6E00BF3);
+      F1(D, E, F, G, H, A, B, C, W[29], 0xD5A79147);
+      F1(C, D, E, F, G, H, A, B, W[30], 0x06CA6351);
+      F1(B, C, D, E, F, G, H, A, W[31], 0x14292967);
+      F1(A, B, C, D, E, F, G, H, W[32], 0x27B70A85);
+      F1(H, A, B, C, D, E, F, G, W[33], 0x2E1B2138);
+      F1(G, H, A, B, C, D, E, F, W[34], 0x4D2C6DFC);
+      F1(F, G, H, A, B, C, D, E, W[35], 0x53380D13);
+      F1(E, F, G, H, A, B, C, D, W[36], 0x650A7354);
+      F1(D, E, F, G, H, A, B, C, W[37], 0x766A0ABB);
+      F1(C, D, E, F, G, H, A, B, W[38], 0x81C2C92E);
+      F1(B, C, D, E, F, G, H, A, W[39], 0x92722C85);
+      F1(A, B, C, D, E, F, G, H, W[40], 0xA2BFE8A1);
+      F1(H, A, B, C, D, E, F, G, W[41], 0xA81A664B);
+      F1(G, H, A, B, C, D, E, F, W[42], 0xC24B8B70);
+      F1(F, G, H, A, B, C, D, E, W[43], 0xC76C51A3);
+      F1(E, F, G, H, A, B, C, D, W[44], 0xD192E819);
+      F1(D, E, F, G, H, A, B, C, W[45], 0xD6990624);
+      F1(C, D, E, F, G, H, A, B, W[46], 0xF40E3585);
+      F1(B, C, D, E, F, G, H, A, W[47], 0x106AA070);
+      F1(A, B, C, D, E, F, G, H, W[48], 0x19A4C116);
+      F1(H, A, B, C, D, E, F, G, W[49], 0x1E376C08);
+      F1(G, H, A, B, C, D, E, F, W[50], 0x2748774C);
+      F1(F, G, H, A, B, C, D, E, W[51], 0x34B0BCB5);
+      F1(E, F, G, H, A, B, C, D, W[52], 0x391C0CB3);
+      F1(D, E, F, G, H, A, B, C, W[53], 0x4ED8AA4A);
+      F1(C, D, E, F, G, H, A, B, W[54], 0x5B9CCA4F);
+      F1(B, C, D, E, F, G, H, A, W[55], 0x682E6FF3);
+      F1(A, B, C, D, E, F, G, H, W[56], 0x748F82EE);
+      F1(H, A, B, C, D, E, F, G, W[57], 0x78A5636F);
+      F1(G, H, A, B, C, D, E, F, W[58], 0x84C87814);
+      F1(F, G, H, A, B, C, D, E, W[59], 0x8CC70208);
+      F1(E, F, G, H, A, B, C, D, W[60], 0x90BEFFFA);
+      F1(D, E, F, G, H, A, B, C, W[61], 0xA4506CEB);
+      F1(C, D, E, F, G, H, A, B, W[62], 0xBEF9A3F7);
+      F1(B, C, D, E, F, G, H, A, W[63], 0xC67178F2);
+
+      A = (digest[0] += A);
+      B = (digest[1] += B);
+      C = (digest[2] += C);
+      D = (digest[3] += D);
+      E = (digest[4] += E);
+      F = (digest[5] += F);
+      G = (digest[6] += G);
+      H = (digest[7] += H);
+
+      input += 64;
+      }
+   }
+
+}
+
+/*
+* SHA-224 compression function
+*/
+void SHA_224::compress_n(const byte input[], u32bit blocks)
+   {
+   sha2_32_compress(W, digest, input, blocks);
+   }
+
+/*
+* Copy out the digest
+*/
+void SHA_224::copy_out(byte output[])
+   {
+   for(u32bit j = 0; j != OUTPUT_LENGTH; j += 4)
+      store_be(digest[j/4], output + j);
+   }
+
+/*
+* Clear memory of sensitive data
+*/
+void SHA_224::clear()
+   {
+   MDx_HashFunction::clear();
+   zeroise(W);
+   digest[0] = 0xC1059ED8;
+   digest[1] = 0x367CD507;
+   digest[2] = 0x3070DD17;
+   digest[3] = 0xF70E5939;
+   digest[4] = 0xFFC00B31;
+   digest[5] = 0x68581511;
+   digest[6] = 0x64F98FA7;
+   digest[7] = 0xBEFA4FA4;
+   }
+
+/*
+* SHA-256 compression function
+*/
+void SHA_256::compress_n(const byte input[], u32bit blocks)
+   {
+   sha2_32_compress(W, digest, input, blocks);
+   }
+
+/*
+* Copy out the digest
+*/
+void SHA_256::copy_out(byte output[])
+   {
+   for(u32bit j = 0; j != OUTPUT_LENGTH; j += 4)
+      store_be(digest[j/4], output + j);
+   }
+
+/*
+* Clear memory of sensitive data
+*/
+void SHA_256::clear()
+   {
+   MDx_HashFunction::clear();
+   zeroise(W);
+   digest[0] = 0x6A09E667;
+   digest[1] = 0xBB67AE85;
+   digest[2] = 0x3C6EF372;
+   digest[3] = 0xA54FF53A;
+   digest[4] = 0x510E527F;
+   digest[5] = 0x9B05688C;
+   digest[6] = 0x1F83D9AB;
+   digest[7] = 0x5BE0CD19;
+   }
+
+}
diff --git a/src/hash/sha2_32/sha2_32.h b/src/hash/sha2_32/sha2_32.h
new file mode 100644
index 000000000..a3e3a6f19
--- /dev/null
+++ b/src/hash/sha2_32/sha2_32.h
@@ -0,0 +1,56 @@
+/*
+* SHA-{224,256}
+* (C) 1999-2010 Jack Lloyd
+*     2007 FlexSecure GmbH
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_SHA_224_256_H__
+#define BOTAN_SHA_224_256_H__
+
+#include <botan/mdx_hash.h>
+
+namespace Botan {
+
+/**
+* SHA-224
+*/
+class BOTAN_DLL SHA_224 : public MDx_HashFunction
+   {
+   public:
+      void clear();
+      std::string name() const { return "SHA-224"; }
+      HashFunction* clone() const { return new SHA_224; }
+
+      SHA_224() : MDx_HashFunction(28, 64, true, true), W(64), digest(8)
+         { clear(); }
+   private:
+      void compress_n(const byte[], u32bit blocks);
+      void copy_out(byte[]);
+
+      SecureVector<u32bit> W, digest;
+   };
+
+/**
+* SHA-256
+*/
+class BOTAN_DLL SHA_256 : public MDx_HashFunction
+   {
+   public:
+      void clear();
+      std::string name() const { return "SHA-256"; }
+      HashFunction* clone() const { return new SHA_256; }
+
+      SHA_256() : MDx_HashFunction(32, 64, true, true), W(64), digest(8)
+         { clear(); }
+   private:
+      void compress_n(const byte[], u32bit blocks);
+      void copy_out(byte[]);
+
+      SecureVector<u32bit> W, digest;
+   };
+
+}
+
+#endif