From 26abd45c61294aacdd59fa4763ff1cd78aefbc7c Mon Sep 17 00:00:00 2001 From: lloyd Date: Mon, 29 Sep 2008 17:43:36 +0000 Subject: Make asm implementations distinctly named objects, for instance MD5_IA32, rather than silently replacing the C++ versions. Instead they are silently replaced (currently, at least) at the lookup level: we switch off the set of feature macros set to choose the best implementation in the current build configuration. So you can have (and benchmark) MD5 and MD5_IA32 directly against each other in the same program with no hassles, but if you ask for "MD5", you'll get maybe an MD5 or maybe MD5_IA32. Also make the canonical asm names (which aren't guarded by C++ namespaces) of the form botan___ as in botan_sha160_ia32_compress, to avoid namespace collisions. This change has another bonus that it should in many cases be possible to derive the asm specializations directly from the original implementation, saving some code (and of course logically SHA_160_IA32 is a SHA_160, just one with a faster implementation of the compression function, so this seems reasonable anyway). --- src/hash/sha1_ia32/sha1_ia32.h | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 src/hash/sha1_ia32/sha1_ia32.h (limited to 'src/hash/sha1_ia32/sha1_ia32.h') diff --git a/src/hash/sha1_ia32/sha1_ia32.h b/src/hash/sha1_ia32/sha1_ia32.h new file mode 100644 index 000000000..ab9dd8ac2 --- /dev/null +++ b/src/hash/sha1_ia32/sha1_ia32.h @@ -0,0 +1,36 @@ +/************************************************* +* SHA-160 (IA-32) Header File * +* (C) 1999-2007 Jack Lloyd * +*************************************************/ + +#ifndef BOTAN_SHA_160_IA32_H__ +#define BOTAN_SHA_160_IA32_H__ + +#include + +namespace Botan { + +/************************************************* +* SHA-160 * +*************************************************/ +class BOTAN_DLL SHA_160_IA32 : public MDx_HashFunction + { + public: + void clear() throw(); + std::string name() const { return "SHA-160"; } + HashFunction* clone() const { return new SHA_160_IA32; } + + SHA_160_IA32() : MDx_HashFunction(20, 64, true, true) { clear(); } + private: + void hash(const byte[]); + void copy_out(byte[]); + + SecureBuffer digest; + + // Note 81 instead of normal 80: IA-32 asm needs an extra temp + SecureBuffer W; + }; + +} + +#endif -- cgit v1.2.3