Review nits; also change order of rnd tests to match our "auto" order.

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 9628a5bee20e0d4f95756b22c00b46071d1a0a0b..954733f86c360b0fd4a9355057b5c1c343b235c0 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -916,11 +916,11 @@ tsig_tests_LDADD += $(P11KIT1_LIBS)
 endif
 
 speedtest_SOURCES = \
-        arguments.cc arguments.hh \
+       arguments.cc arguments.hh \
        base32.cc \
        base64.cc base64.hh \
        credentials.cc credentials.hh \
-        dns_random.cc dns_random.hh \
+       dns_random.cc dns_random.hh \
        dnslabeltext.cc \
        dnsname.cc dnsname.hh \
        dnsparser.cc dnsparser.hh \

diff --git a/pdns/speedtest.cc b/pdns/speedtest.cc
index b64dd76db3965ff56a02fa6d161fe79b7e6ccbc2..9aeb90e0435d31904225ca5d6617e148786f41f9 100644 (file)
--- a/pdns/speedtest.cc
+++ b/pdns/speedtest.cc
@@ -1063,10 +1063,10 @@ struct RndSpeedTest
 
   void operator()() const
   {
-    dns_random(0x10000);
+    dns_random_uint16();
   }
 
-  std::string name;
+  const std::string name;
 };
 
 struct CredentialsVerifyTest
@@ -1196,17 +1196,17 @@ try
 
   doRun(UUIDGenTest());
 
-#if defined(HAVE_RANDOMBYTES_STIR)
-  doRun(RndSpeedTest("sodium"));
-#endif
-#if defined(HAVE_RAND_BYTES)
-  doRun(RndSpeedTest("openssl"));
-#endif
 #if defined(HAVE_GETRANDOM)
   doRun(RndSpeedTest("getrandom"));
 #endif
 #if defined(HAVE_ARC4RANDOM)
   doRun(RndSpeedTest("arc4random"));
+#endif
+#if defined(HAVE_RANDOMBYTES_STIR)
+  doRun(RndSpeedTest("sodium"));
+#endif
+#if defined(HAVE_RAND_BYTES)
+  doRun(RndSpeedTest("openssl"));
 #endif
   doRun(RndSpeedTest("urandom"));
 
@@ -1222,7 +1222,7 @@ try
   doRun(NSEC3HashTest(150, "ABCDABCDABCDABCDABCDABCDABCDABCD"));
   doRun(NSEC3HashTest(500, "ABCDABCDABCDABCDABCDABCDABCDABCD"));
 
-#ifdef HAVE_LIBSODIUM
+#if defined(HAVE_LIBSODIUM) && defined(HAVE_EVP_PKEY_CTX_SET1_SCRYPT_SALT)
   doRun(CredentialsHashTest());
   doRun(CredentialsVerifyTest());
 #endif
@@ -1237,7 +1237,6 @@ try
   doRun(StatRingDNSNameQTypeTest(DNSName("example.com"), QType(1)));
 #endif
 
-
   cerr<<"Total runs: " << g_totalRuns<<endl;
 
 }