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/x919_mac/info.txt b/src/mac/x919_mac/info.txt
index f2ebd5b35..16955816c 100644
--- a/src/mac/x919_mac/info.txt
+++ b/src/mac/x919_mac/info.txt
@@ -1,5 +1,3 @@
-realname "ANSI X9.19 MAC"
-
 define ANSI_X919_MAC
 
 load_on auto
diff --git a/src/mac/x919_mac/x919_mac.cpp b/src/mac/x919_mac/x919_mac.cpp
index ef89cac9c..52260494a 100644
--- a/src/mac/x919_mac/x919_mac.cpp
+++ b/src/mac/x919_mac/x919_mac.cpp
@@ -63,7 +63,7 @@ void ANSI_X919_MAC::key_schedule(const byte key[], u32bit length)
 /*
 * Clear memory of sensitive data
 */
-void ANSI_X919_MAC::clear() throw()
+void ANSI_X919_MAC::clear()
    {
    e->clear();
    d->clear();
diff --git a/src/mac/x919_mac/x919_mac.h b/src/mac/x919_mac/x919_mac.h
index 1c2a06bee..a4690fdcd 100644
--- a/src/mac/x919_mac/x919_mac.h
+++ b/src/mac/x919_mac/x919_mac.h
@@ -19,7 +19,7 @@ namespace Botan {
 class BOTAN_DLL ANSI_X919_MAC : public MessageAuthenticationCode
    {
    public:
-      void clear() throw();
+      void clear();
       std::string name() const;
       MessageAuthenticationCode* clone() const;