propagate from branch 'net.randombit.botan.1_8' (head 3158f8272a3582dd44dfb771665eb71f7d005339)

            to branch 'net.randombit.botan' (head bf629b13dd132b263e76a72b7eca0f7e4ab19aac)

3 files changed, 2 insertions, 9 deletions

diff --git a/src/hash/md4/info.txt b/src/hash/md4/info.txt
index fc9cbe116..6aa4a5d59 100644
--- a/src/hash/md4/info.txt
+++ b/src/hash/md4/info.txt
@@ -2,13 +2,6 @@ realname "MD4"
 
 define MD4
 
-load_on auto
-
-<add>
-md4.cpp
-md4.h
-</add>
-
 <requires>
 mdx_hash
 </requires>
diff --git a/src/hash/md4/md4.cpp b/src/hash/md4/md4.cpp
index 39e3c8c41..b2870066d 100644
--- a/src/hash/md4/md4.cpp
+++ b/src/hash/md4/md4.cpp
@@ -95,7 +95,7 @@ void MD4::copy_out(byte output[])
 /*
 * Clear memory of sensitive data
 */
-void MD4::clear() throw()
+void MD4::clear()
    {
    MDx_HashFunction::clear();
    M.clear();
diff --git a/src/hash/md4/md4.h b/src/hash/md4/md4.h
index df6f2292d..0b76a70e4 100644
--- a/src/hash/md4/md4.h
+++ b/src/hash/md4/md4.h
@@ -18,7 +18,7 @@ namespace Botan {
 class BOTAN_DLL MD4 : public MDx_HashFunction
    {
    public:
-      void clear() throw();
+      void clear();
       std::string name() const { return "MD4"; }
       HashFunction* clone() const { return new MD4; }
       MD4() : MDx_HashFunction(16, 64, false, true) { clear(); }