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

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

6 files changed, 3 insertions, 9 deletions

diff --git a/src/checksum/adler32/adler32.h b/src/checksum/adler32/adler32.h
index 98a28bc81..79804a842 100644
--- a/src/checksum/adler32/adler32.h
+++ b/src/checksum/adler32/adler32.h
@@ -18,7 +18,7 @@ namespace Botan {
 class BOTAN_DLL Adler32 : public HashFunction
    {
    public:
-      void clear() throw() { S1 = 1; S2 = 0; }
+      void clear() { S1 = 1; S2 = 0; }
       std::string name() const { return "Adler32"; }
       HashFunction* clone() const { return new Adler32; }
       Adler32() : HashFunction(4) { clear(); }
diff --git a/src/checksum/adler32/info.txt b/src/checksum/adler32/info.txt
index 76662cdec..53bc66354 100644
--- a/src/checksum/adler32/info.txt
+++ b/src/checksum/adler32/info.txt
@@ -1,5 +1,3 @@
-realname "Adler32"
-
 define ADLER32
 
 load_on auto
diff --git a/src/checksum/crc24/crc24.h b/src/checksum/crc24/crc24.h
index bca4d0e89..f59ac4a45 100644
--- a/src/checksum/crc24/crc24.h
+++ b/src/checksum/crc24/crc24.h
@@ -18,7 +18,7 @@ namespace Botan {
 class BOTAN_DLL CRC24 : public HashFunction
    {
    public:
-      void clear() throw() { crc = 0xB704CE; }
+      void clear() { crc = 0xB704CE; }
       std::string name() const { return "CRC24"; }
       HashFunction* clone() const { return new CRC24; }
       CRC24() : HashFunction(3) { clear(); }
diff --git a/src/checksum/crc24/info.txt b/src/checksum/crc24/info.txt
index 33b86a9da..8c61aa58b 100644
--- a/src/checksum/crc24/info.txt
+++ b/src/checksum/crc24/info.txt
@@ -1,5 +1,3 @@
-realname "CRC-24"
-
 define CRC24
 
 load_on auto
diff --git a/src/checksum/crc32/crc32.h b/src/checksum/crc32/crc32.h
index 390fb100e..998e8489e 100644
--- a/src/checksum/crc32/crc32.h
+++ b/src/checksum/crc32/crc32.h
@@ -18,7 +18,7 @@ namespace Botan {
 class BOTAN_DLL CRC32 : public HashFunction
    {
    public:
-      void clear() throw() { crc = 0xFFFFFFFF; }
+      void clear() { crc = 0xFFFFFFFF; }
       std::string name() const { return "CRC32"; }
       HashFunction* clone() const { return new CRC32; }
       CRC32() : HashFunction(4) { clear(); }
diff --git a/src/checksum/crc32/info.txt b/src/checksum/crc32/info.txt
index 15933b375..d86848cf4 100644
--- a/src/checksum/crc32/info.txt
+++ b/src/checksum/crc32/info.txt
@@ -1,5 +1,3 @@
-realname "CRC-32"
-
 define CRC32
 
 load_on auto