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

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

18 files changed, 13 insertions, 25 deletions

diff --git a/src/mac/cbc_mac/cbc_mac.cpp b/src/mac/cbc_mac/cbc_mac.cpp
index f5d9e1567..0617e3e90 100644
--- a/src/mac/cbc_mac/cbc_mac.cpp
+++ b/src/mac/cbc_mac/cbc_mac.cpp
@@ -62,7 +62,7 @@ void CBC_MAC::key_schedule(const byte key[], u32bit length)
 /*
 * Clear memory of sensitive data
 */
-void CBC_MAC::clear() throw()
+void CBC_MAC::clear()
    {
    e->clear();
    state.clear();
diff --git a/src/mac/cbc_mac/cbc_mac.h b/src/mac/cbc_mac/cbc_mac.h
index d17d792d3..15026c0a9 100644
--- a/src/mac/cbc_mac/cbc_mac.h
+++ b/src/mac/cbc_mac/cbc_mac.h
@@ -19,7 +19,7 @@ namespace Botan {
 class BOTAN_DLL CBC_MAC : public MessageAuthenticationCode
    {
    public:
-      void clear() throw();
+      void clear();
       std::string name() const;
       MessageAuthenticationCode* clone() const;
 
diff --git a/src/mac/cbc_mac/info.txt b/src/mac/cbc_mac/info.txt
index 3a5434974..80adc5fd0 100644
--- a/src/mac/cbc_mac/info.txt
+++ b/src/mac/cbc_mac/info.txt
@@ -1,5 +1,3 @@
-realname "CBC-MAC"
-
 define CBC_MAC
 
 load_on auto
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
diff --git a/src/mac/hmac/hmac.cpp b/src/mac/hmac/hmac.cpp
index 717e2640c..99be479fa 100644
--- a/src/mac/hmac/hmac.cpp
+++ b/src/mac/hmac/hmac.cpp
@@ -58,7 +58,7 @@ void HMAC::key_schedule(const byte key[], u32bit length)
 /*
 * Clear memory of sensitive data
 */
-void HMAC::clear() throw()
+void HMAC::clear()
    {
    hash->clear();
    i_key.clear();
diff --git a/src/mac/hmac/hmac.h b/src/mac/hmac/hmac.h
index 932af71fc..62bb69853 100644
--- a/src/mac/hmac/hmac.h
+++ b/src/mac/hmac/hmac.h
@@ -19,7 +19,7 @@ namespace Botan {
 class BOTAN_DLL HMAC : public MessageAuthenticationCode
    {
    public:
-      void clear() throw();
+      void clear();
       std::string name() const;
       MessageAuthenticationCode* clone() const;
 
diff --git a/src/mac/hmac/info.txt b/src/mac/hmac/info.txt
index cdf2e67ab..26da83533 100644
--- a/src/mac/hmac/info.txt
+++ b/src/mac/hmac/info.txt
@@ -1,5 +1,3 @@
-realname "HMAC"
-
 define HMAC
 
 load_on auto
diff --git a/src/mac/info.txt b/src/mac/info.txt
index 239eb633f..9a839d04d 100644
--- a/src/mac/info.txt
+++ b/src/mac/info.txt
@@ -1,5 +1,3 @@
-realname "Message Authentication Codes"
-
 load_on auto
 
 <add>
diff --git a/src/mac/mac.cpp b/src/mac/mac.cpp
index 96df25503..04b259647 100644
--- a/src/mac/mac.cpp
+++ b/src/mac/mac.cpp
@@ -1,6 +1,6 @@
 /**
-Message Authentication Code base class
-(C) 1999-2008 Jack Lloyd
+* Message Authentication Code base class
+* (C) 1999-2008 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
diff --git a/src/mac/mac.h b/src/mac/mac.h
index 3ec5fff5f..7c73a2900 100644
--- a/src/mac/mac.h
+++ b/src/mac/mac.h
@@ -43,7 +43,7 @@ class BOTAN_DLL MessageAuthenticationCode : public BufferedComputation,
       /**
       * Reset the internal state of this object.
       */
-      virtual void clear() throw() = 0;
+      virtual void clear() = 0;
 
       MessageAuthenticationCode(u32bit mac_len,
                                 u32bit key_min,
diff --git a/src/mac/ssl3mac/info.txt b/src/mac/ssl3mac/info.txt
index f8791169c..c4ef54629 100644
--- a/src/mac/ssl3mac/info.txt
+++ b/src/mac/ssl3mac/info.txt
@@ -1,5 +1,3 @@
-realname "SSLv3 MAC"
-
 define SSL3_MAC
 
 load_on auto
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;
 
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;