rec: Remove mentions of rng and entropy-source in as much places as possible

Rec part of of #16554

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/pdns/recursordist/docs/manpages/pdns_recursor.1.rst b/pdns/recursordist/docs/manpages/pdns_recursor.1.rst
index 6212ba76a5e1c6a8062bb3d089b8a690f587426b..2157f851ba58ca1b51036d4434eb04570c1a5abb 100644 (file)
--- a/pdns/recursordist/docs/manpages/pdns_recursor.1.rst
+++ b/pdns/recursordist/docs/manpages/pdns_recursor.1.rst
@@ -58,8 +58,6 @@ at `<https://doc.powerdns.com/>`
     ``pdns_recursor --config | grep ' config-dir='``.
 --daemon
     Operate as a daemon.
---entropy-source=<file>
-    Read new entropy from *file*, defaults to /dev/urandom.
 --export-etc-hosts
     If set, this flag will export the hostnames and IP addresses
     mentioned in /etc/hosts.

diff --git a/pdns/recursordist/rec-rust-lib/table.py b/pdns/recursordist/rec-rust-lib/table.py
index febd0c6500d16f4a32d267600fd372c26ebddde2..25e6b1feece044e39aec590e2e6f6d4f12c32029 100644 (file)
--- a/pdns/recursordist/rec-rust-lib/table.py
+++ b/pdns/recursordist/rec-rust-lib/table.py
@@ -971,12 +971,8 @@ Only makes sense to set on the command line.
         'section' : 'recursor',
         'type' : LType.String,
         'default' : '/dev/urandom',
-        'help' : 'If set, read entropy from this file',
+        'help' : '',
         'doc' : '''
-PowerDNS can read entropy from a (hardware) source.
-This is used for generating random numbers which are very hard to predict.
-Generally on UNIX platforms, this source will be ``/dev/urandom``, which will always supply random numbers, even if entropy is lacking.
-Change to ``/dev/random`` if PowerDNS should block waiting for enough entropy to arrive.
  ''',
         'skip-yaml': True,
         'versionchanged': ('4.9.0', 'This setting is no longer used.'),
@@ -2369,19 +2365,8 @@ Since 4.1.0, when :ref:`setting-pdns-distributes-queries` is disabled and :ref:`
         'section' : 'recursor',
         'type' : LType.String,
         'default' : 'auto',
-        'help' : 'Specify random number generator to use. Valid values are auto,sodium,openssl,getrandom,arc4random,urandom.',
-        'doc' : '''
-- String
-- Default: auto
-
-Specify which random number generator to use. Permissible choices are
- - auto - choose automatically
- - sodium - Use libsodium ``randombytes_uniform``
- - openssl - Use libcrypto ``RAND_bytes``
- - getrandom - Use libc getrandom, falls back to urandom if it does not really work
- - arc4random - Use BSD ``arc4random_uniform``
- - urandom - Use ``/dev/urandom``
- - kiss - Use simple settable deterministic RNG. **FOR TESTING PURPOSES ONLY!**
+        'help' : '',
+        'doc' : '''
  ''',
         'skip-yaml': True,
         'versionchanged': ('4.9.0', 'This setting is no longer used.')

diff --git a/pdns/recursordist/testrunner.cc b/pdns/recursordist/testrunner.cc
index ee3a38eb87020a9a78db019464890576b6f1f956..c07ca65c6e5750fb579b12168a0bdb4c808a1d3d 100644 (file)
--- a/pdns/recursordist/testrunner.cc
+++ b/pdns/recursordist/testrunner.cc
@@ -68,8 +68,6 @@ static void loggerBackend(const Logging::Entry& entry)
 
 static bool init_unit_test()
 {
-  ::arg().set("rng") = "auto";
-  ::arg().set("entropy-source") = "/dev/urandom";
   // Force init while we are still unthreaded
   dns_random_uint16();
   g_slog = Logging::Logger::create(loggerBackend);