propagate from branch 'net.randombit.botan.1_8' (head 6e8c18515725a70923b34118951252723dd4c29a)

            to branch 'net.randombit.botan' (head 77ba4ea5a4be36d6d029bcc852b2271edff0d679)

3 files changed, 2 insertions, 4 deletions

diff --git a/src/mac/cmac/cmac.cpp b/src/mac/cmac/cmac.cpp
index 84aa61e03..58923138b 100644
--- a/src/mac/cmac/cmac.cpp
+++ b/src/mac/cmac/cmac.cpp
@@ -101,7 +101,7 @@ void CMAC::key_schedule(const byte key[], u32bit length)
 /*
 * Clear memory of sensitive data
 */
-void CMAC::clear() throw()
+void CMAC::clear()
    {
    e->clear();
    state.clear();
diff --git a/src/mac/cmac/cmac.h b/src/mac/cmac/cmac.h
index 5a6deb7b0..8297e5ea1 100644
--- a/src/mac/cmac/cmac.h
+++ b/src/mac/cmac/cmac.h
@@ -19,7 +19,7 @@ namespace Botan {
 class BOTAN_DLL CMAC : public MessageAuthenticationCode
    {
    public:
-      void clear() throw();
+      void clear();
       std::string name() const;
       MessageAuthenticationCode* clone() const;
 
diff --git a/src/mac/cmac/info.txt b/src/mac/cmac/info.txt
index b593c9d38..5dad789de 100644
--- a/src/mac/cmac/info.txt
+++ b/src/mac/cmac/info.txt
@@ -1,5 +1,3 @@
-realname "CMAC"
-
 define CMAC
 
 load_on auto