Derive x86, x86-64, and SSE2 implementations of SHA-1 directly from SHA_160

3 files changed, 4 insertions, 34 deletions

diff --git a/src/hash/sha1_sse2/info.txt b/src/hash/sha1_sse2/info.txt
index cf5fb0943..2512e84be 100644
--- a/src/hash/sha1_sse2/info.txt
+++ b/src/hash/sha1_sse2/info.txt
@@ -11,7 +11,7 @@ sha1_sse2.h
 </add>
 
 <requires>
-mdx_hash
+sha1
 utils
 </requires>
 
diff --git a/src/hash/sha1_sse2/sha1_sse2.cpp b/src/hash/sha1_sse2/sha1_sse2.cpp
index df7f2277c..36d266dcf 100644
--- a/src/hash/sha1_sse2/sha1_sse2.cpp
+++ b/src/hash/sha1_sse2/sha1_sse2.cpp
@@ -4,8 +4,6 @@
 *************************************************/
 
 #include <botan/sha1_sse2.h>
-#include <botan/loadstor.h>
-#include <botan/bit_ops.h>
 
 namespace Botan {
 
@@ -19,26 +17,4 @@ void SHA_160_SSE2::hash(const byte input[])
    botan_sha1_sse2_compress(digest, input);
    }
 
-/*************************************************
-* Copy out the digest                            *
-*************************************************/
-void SHA_160_SSE2::copy_out(byte output[])
-   {
-   for(u32bit j = 0; j != OUTPUT_LENGTH; ++j)
-      output[j] = get_byte(j % 4, digest[j/4]);
-   }
-
-/*************************************************
-* Clear memory of sensitive data                 *
-*************************************************/
-void SHA_160_SSE2::clear() throw()
-   {
-   MDx_HashFunction::clear();
-   digest[0] = 0x67452301;
-   digest[1] = 0xEFCDAB89;
-   digest[2] = 0x98BADCFE;
-   digest[3] = 0x10325476;
-   digest[4] = 0xC3D2E1F0;
-   }
-
 }
diff --git a/src/hash/sha1_sse2/sha1_sse2.h b/src/hash/sha1_sse2/sha1_sse2.h
index 5683acc4f..ecb8fc95d 100644
--- a/src/hash/sha1_sse2/sha1_sse2.h
+++ b/src/hash/sha1_sse2/sha1_sse2.h
@@ -6,26 +6,20 @@
 #ifndef BOTAN_SHA_160_SSE2_H__
 #define BOTAN_SHA_160_SSE2_H__
 
-#include <botan/mdx_hash.h>
+#include <botan/sha160.h>
 
 namespace Botan {
 
 /*************************************************
 * SHA-160                                        *
 *************************************************/
-class SHA_160_SSE2 : public MDx_HashFunction
+class SHA_160_SSE2 : public SHA_160
    {
    public:
-      void clear() throw();
-      std::string name() const { return "SHA-160"; }
       HashFunction* clone() const { return new SHA_160_SSE2; }
-
-      SHA_160_SSE2() : MDx_HashFunction(20, 64, true, true) { clear(); }
+      SHA_160_SSE2() : SHA_160(0) {} // no W needed
    private:
       void hash(const byte[]);
-      void copy_out(byte[]);
-
-      SecureBuffer<u32bit, 5> digest;
    };
 
 }