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

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

14 files changed, 11 insertions, 22 deletions

diff --git a/src/rng/auto_rng/auto_rng.cpp b/src/rng/auto_rng/auto_rng.cpp
index 8405170ad..f02a9249f 100644
--- a/src/rng/auto_rng/auto_rng.cpp
+++ b/src/rng/auto_rng/auto_rng.cpp
@@ -143,7 +143,7 @@ AutoSeeded_RNG::AutoSeeded_RNG(u32bit poll_bits)
 #endif
 
    if(!rng)
-      throw Algorithm_Not_Found("No usable RNG found enabled in build");
+      throw Internal_Error("No usable RNG found enabled in build");
 
    /* If X9.31 is available, use it to wrap the other RNG as a failsafe */
 #if defined(BOTAN_HAS_X931_RNG) && defined(BOTAN_HAS_AES)
diff --git a/src/rng/auto_rng/auto_rng.h b/src/rng/auto_rng/auto_rng.h
index f18f8e5cd..a15b11b13 100644
--- a/src/rng/auto_rng/auto_rng.h
+++ b/src/rng/auto_rng/auto_rng.h
@@ -23,7 +23,7 @@ class BOTAN_DLL AutoSeeded_RNG : public RandomNumberGenerator
          { rng->randomize(out, len); }
       bool is_seeded() const
          { return rng->is_seeded(); }
-      void clear() throw() { rng->clear(); }
+      void clear() { rng->clear(); }
       std::string name() const
          { return "AutoSeeded(" + rng->name() + ")"; }
 
diff --git a/src/rng/auto_rng/info.txt b/src/rng/auto_rng/info.txt
index 7d5d5ddcc..d5abfc757 100644
--- a/src/rng/auto_rng/info.txt
+++ b/src/rng/auto_rng/info.txt
@@ -1,5 +1,3 @@
-realname "Auto-seeded Random Number Generator"
-
 define AUTO_SEEDING_RNG
 
 load_on auto
diff --git a/src/rng/hmac_rng/hmac_rng.cpp b/src/rng/hmac_rng/hmac_rng.cpp
index 113489db3..9d5ee97e4 100644
--- a/src/rng/hmac_rng/hmac_rng.cpp
+++ b/src/rng/hmac_rng/hmac_rng.cpp
@@ -8,7 +8,6 @@
 #include <botan/hmac_rng.h>
 #include <botan/loadstor.h>
 #include <botan/xor_buf.h>
-#include <botan/util.h>
 #include <botan/stl_util.h>
 #include <algorithm>
 
@@ -148,7 +147,7 @@ void HMAC_RNG::add_entropy_source(EntropySource* src)
 /*
 * Clear memory of sensitive data
 */
-void HMAC_RNG::clear() throw()
+void HMAC_RNG::clear()
    {
    extractor->clear();
    prf->clear();
diff --git a/src/rng/hmac_rng/hmac_rng.h b/src/rng/hmac_rng/hmac_rng.h
index 318e2a931..97b0baf15 100644
--- a/src/rng/hmac_rng/hmac_rng.h
+++ b/src/rng/hmac_rng/hmac_rng.h
@@ -29,7 +29,7 @@ class BOTAN_DLL HMAC_RNG : public RandomNumberGenerator
    public:
       void randomize(byte buf[], u32bit len);
       bool is_seeded() const { return seeded; }
-      void clear() throw();
+      void clear();
       std::string name() const;
 
       void reseed(u32bit poll_bits);
diff --git a/src/rng/hmac_rng/info.txt b/src/rng/hmac_rng/info.txt
index 2c7f13e0a..f6135ee5a 100644
--- a/src/rng/hmac_rng/info.txt
+++ b/src/rng/hmac_rng/info.txt
@@ -1,5 +1,3 @@
-realname "HMAC RNG"
-
 define HMAC_RNG
 
 load_on auto
diff --git a/src/rng/info.txt b/src/rng/info.txt
index 44a41665d..eea122cf9 100644
--- a/src/rng/info.txt
+++ b/src/rng/info.txt
@@ -1,5 +1,3 @@
-realname "Random Number Generators"
-
 load_on auto
 
 <add>
diff --git a/src/rng/randpool/info.txt b/src/rng/randpool/info.txt
index cc7f61552..cab276e15 100644
--- a/src/rng/randpool/info.txt
+++ b/src/rng/randpool/info.txt
@@ -1,5 +1,3 @@
-realname "Randpool RNG"
-
 define RANDPOOL
 
 load_on auto
diff --git a/src/rng/randpool/randpool.cpp b/src/rng/randpool/randpool.cpp
index 77a5228c6..9ec92267d 100644
--- a/src/rng/randpool/randpool.cpp
+++ b/src/rng/randpool/randpool.cpp
@@ -8,7 +8,7 @@
 #include <botan/randpool.h>
 #include <botan/loadstor.h>
 #include <botan/xor_buf.h>
-#include <botan/util.h>
+#include <botan/timer.h>
 #include <botan/stl_util.h>
 #include <algorithm>
 
@@ -149,7 +149,7 @@ void Randpool::add_entropy_source(EntropySource* src)
 /**
 * Clear memory of sensitive data
 */
-void Randpool::clear() throw()
+void Randpool::clear()
    {
    cipher->clear();
    mac->clear();
diff --git a/src/rng/randpool/randpool.h b/src/rng/randpool/randpool.h
index b6a3adda4..ab6ed6748 100644
--- a/src/rng/randpool/randpool.h
+++ b/src/rng/randpool/randpool.h
@@ -23,7 +23,7 @@ class BOTAN_DLL Randpool : public RandomNumberGenerator
    public:
       void randomize(byte[], u32bit);
       bool is_seeded() const { return seeded; }
-      void clear() throw();
+      void clear();
       std::string name() const;
 
       void reseed(u32bit bits_to_collect);
diff --git a/src/rng/rng.h b/src/rng/rng.h
index 41904dbef..c53d8e22d 100644
--- a/src/rng/rng.h
+++ b/src/rng/rng.h
@@ -47,7 +47,7 @@ class BOTAN_DLL RandomNumberGenerator
       /**
       * Clear all internally held values of this RNG.
       */
-      virtual void clear() throw() = 0;
+      virtual void clear() = 0;
 
       /**
       * Return the name of this object
@@ -89,7 +89,7 @@ class BOTAN_DLL Null_RNG : public RandomNumberGenerator
    {
    public:
       void randomize(byte[], u32bit) { throw PRNG_Unseeded("Null_RNG"); }
-      void clear() throw() {}
+      void clear() {}
       std::string name() const { return "Null_RNG"; }
 
       void reseed(u32bit) {}
diff --git a/src/rng/x931_rng/info.txt b/src/rng/x931_rng/info.txt
index 633eb0268..35836b33b 100644
--- a/src/rng/x931_rng/info.txt
+++ b/src/rng/x931_rng/info.txt
@@ -1,5 +1,3 @@
-realname "ANSI X9.31 PRNG"
-
 define X931_RNG
 
 load_on auto
diff --git a/src/rng/x931_rng/x931_rng.cpp b/src/rng/x931_rng/x931_rng.cpp
index e239bce84..64d57ac1c 100644
--- a/src/rng/x931_rng/x931_rng.cpp
+++ b/src/rng/x931_rng/x931_rng.cpp
@@ -108,7 +108,7 @@ bool ANSI_X931_RNG::is_seeded() const
 /**
 * Clear memory of sensitive data
 */
-void ANSI_X931_RNG::clear() throw()
+void ANSI_X931_RNG::clear()
    {
    cipher->clear();
    prng->clear();
diff --git a/src/rng/x931_rng/x931_rng.h b/src/rng/x931_rng/x931_rng.h
index 44e9b4428..d5ba2e9eb 100644
--- a/src/rng/x931_rng/x931_rng.h
+++ b/src/rng/x931_rng/x931_rng.h
@@ -21,7 +21,7 @@ class BOTAN_DLL ANSI_X931_RNG : public RandomNumberGenerator
    public:
       void randomize(byte[], u32bit);
       bool is_seeded() const;
-      void clear() throw();
+      void clear();
       std::string name() const;
 
       void reseed(u32bit poll_bits);