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/md5/info.txt b/src/hash/md5/info.txt
index 525a45ab5..14861d635 100644
--- a/src/hash/md5/info.txt
+++ b/src/hash/md5/info.txt
@@ -2,13 +2,6 @@ realname "MD5"
 
 define MD5
 
-load_on auto
-
-<add>
-md5.cpp
-md5.h
-</add>
-
 <requires>
 mdx_hash
 </requires>
diff --git a/src/hash/md5/md5.cpp b/src/hash/md5/md5.cpp
index 7c280aab7..163413bec 100644
--- a/src/hash/md5/md5.cpp
+++ b/src/hash/md5/md5.cpp
@@ -123,7 +123,7 @@ void MD5::copy_out(byte output[])
 /*
 * Clear memory of sensitive data
 */
-void MD5::clear() throw()
+void MD5::clear()
    {
    MDx_HashFunction::clear();
    M.clear();
diff --git a/src/hash/md5/md5.h b/src/hash/md5/md5.h
index 85f684d8b..456a02c28 100644
--- a/src/hash/md5/md5.h
+++ b/src/hash/md5/md5.h
@@ -18,7 +18,7 @@ namespace Botan {
 class BOTAN_DLL MD5 : public MDx_HashFunction
    {
    public:
-      void clear() throw();
+      void clear();
       std::string name() const { return "MD5"; }
       HashFunction* clone() const { return new MD5; }
       MD5() : MDx_HashFunction(16, 64, false, true) { clear(); }