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

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

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mac/ssl3mac/ssl3_mac.cpp b/src/mac/ssl3mac/ssl3_mac.cpp
index c29296ced..23a636424 100644
--- a/src/mac/ssl3mac/ssl3_mac.cpp
+++ b/src/mac/ssl3mac/ssl3_mac.cpp
@@ -46,7 +46,7 @@ void SSL3_MAC::key_schedule(const byte key[], u32bit length)
 /*
 * Clear memory of sensitive data
 */
-void SSL3_MAC::clear() throw()
+void SSL3_MAC::clear()
    {
    hash->clear();
    i_key.clear();
diff --git a/src/mac/ssl3mac/ssl3_mac.h b/src/mac/ssl3mac/ssl3_mac.h
index dcaf7f404..828b072ed 100644
--- a/src/mac/ssl3mac/ssl3_mac.h
+++ b/src/mac/ssl3mac/ssl3_mac.h
@@ -19,7 +19,7 @@ namespace Botan {
 class BOTAN_DLL SSL3_MAC : public MessageAuthenticationCode
    {
    public:
-      void clear() throw();
+      void clear();
       std::string name() const;
       MessageAuthenticationCode* clone() const;