Avoid use of deprecated function in (deprecated) Serialized_RNG constructor

2 files changed, 12 insertions, 2 deletions

diff --git a/src/lib/rng/rng.cpp b/src/lib/rng/rng.cpp
index 57e25cdd2..4fa8e42a6 100644
--- a/src/lib/rng/rng.cpp
+++ b/src/lib/rng/rng.cpp
@@ -58,7 +58,16 @@ RandomNumberGenerator* RandomNumberGenerator::make_rng()
    }
 
 #if defined(BOTAN_TARGET_OS_HAS_THREADS)
-Serialized_RNG::Serialized_RNG() : m_rng(RandomNumberGenerator::make_rng()) {}
+
+#if defined(BOTAN_HAS_AUTO_SEEDING_RNG)
+Serialized_RNG::Serialized_RNG() : m_rng(new AutoSeeded_RNG) {}
+#else
+Serialized_RNG::Serialized_RNG()
+   {
+   throw Exception("Serialized_RNG default constructor failed: AutoSeeded_RNG disabled in build");
+   }
+#endif
+
 #endif
 
 }
diff --git a/src/lib/rng/rng.h b/src/lib/rng/rng.h
index d8d3c855f..09908ab3c 100644
--- a/src/lib/rng/rng.h
+++ b/src/lib/rng/rng.h
@@ -174,7 +174,8 @@ class BOTAN_DLL RandomNumberGenerator
 typedef RandomNumberGenerator RNG;
 
 /**
-* Hardware RNG has no members but exists to tag hardware RNG types
+* Hardware_RNG has no members but exists to tag hardware RNG types
+* (PKCS11_RNG, TPM_RNG, RDRAND_RNG)
 */
 class BOTAN_DLL Hardware_RNG : public RandomNumberGenerator
    {