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/md2/info.txt b/src/hash/md2/info.txt
index ff33e1eb3..4428584fd 100644
--- a/src/hash/md2/info.txt
+++ b/src/hash/md2/info.txt
@@ -1,10 +1,3 @@
 realname "MD2"
 
 define MD2
-
-load_on auto
-
-<add>
-md2.cpp
-md2.h
-</add>
diff --git a/src/hash/md2/md2.cpp b/src/hash/md2/md2.cpp
index c67e72b5a..f03518ec0 100644
--- a/src/hash/md2/md2.cpp
+++ b/src/hash/md2/md2.cpp
@@ -97,7 +97,7 @@ void MD2::final_result(byte output[])
 /**
 * Clear memory of sensitive data
 */
-void MD2::clear() throw()
+void MD2::clear()
    {
    X.clear();
    checksum.clear();
diff --git a/src/hash/md2/md2.h b/src/hash/md2/md2.h
index 9337c43f4..0a7125759 100644
--- a/src/hash/md2/md2.h
+++ b/src/hash/md2/md2.h
@@ -18,7 +18,7 @@ namespace Botan {
 class BOTAN_DLL MD2 : public HashFunction
    {
    public:
-      void clear() throw();
+      void clear();
       std::string name() const { return "MD2"; }
       HashFunction* clone() const { return new MD2; }
       MD2() : HashFunction(16, 16) { clear(); }