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/rmd128/info.txt b/src/hash/rmd128/info.txt
index 402271da5..0a1ef2c74 100644
--- a/src/hash/rmd128/info.txt
+++ b/src/hash/rmd128/info.txt
@@ -2,13 +2,6 @@ realname "RIPEMD-128"
 
 define RIPEMD_128
 
-load_on auto
-
-<add>
-rmd128.cpp
-rmd128.h
-</add>
-
 <requires>
 mdx_hash
 </requires>
diff --git a/src/hash/rmd128/rmd128.cpp b/src/hash/rmd128/rmd128.cpp
index 8b2c0ccf8..899e50914 100644
--- a/src/hash/rmd128/rmd128.cpp
+++ b/src/hash/rmd128/rmd128.cpp
@@ -159,7 +159,7 @@ void RIPEMD_128::copy_out(byte output[])
 /*
 * Clear memory of sensitive data
 */
-void RIPEMD_128::clear() throw()
+void RIPEMD_128::clear()
    {
    MDx_HashFunction::clear();
    M.clear();
diff --git a/src/hash/rmd128/rmd128.h b/src/hash/rmd128/rmd128.h
index 031ae5746..d9cb4ebb4 100644
--- a/src/hash/rmd128/rmd128.h
+++ b/src/hash/rmd128/rmd128.h
@@ -18,7 +18,7 @@ namespace Botan {
 class BOTAN_DLL RIPEMD_128 : public MDx_HashFunction
    {
    public:
-      void clear() throw();
+      void clear();
       std::string name() const { return "RIPEMD-128"; }
       HashFunction* clone() const { return new RIPEMD_128; }
       RIPEMD_128() : MDx_HashFunction(16, 64, false, true) { clear(); }