Merge master into this branch, resolving conflicts with #457/#576

which recently landed on master.

3 files changed, 14 insertions, 41 deletions

diff --git a/src/lib/entropy/rdrand/info.txt b/src/lib/entropy/rdrand/info.txt
index e3e1a2a50..ebc7fb747 100644
--- a/src/lib/entropy/rdrand/info.txt
+++ b/src/lib/entropy/rdrand/info.txt
@@ -1,6 +1,8 @@
 define ENTROPY_SRC_RDRAND 20131128
 
-need_isa rdrand
+<requires>
+rdrand_rng
+</requires>
 
 <source>
 rdrand.cpp
@@ -9,15 +11,3 @@ rdrand.cpp
 <header:internal>
 rdrand.h
 </header:internal>
-
-<arch>
-x86_32
-x86_64
-</arch>
-
-<cc>
-gcc
-clang
-icc
-msvc
-</cc>
diff --git a/src/lib/entropy/rdrand/rdrand.cpp b/src/lib/entropy/rdrand/rdrand.cpp
index 89234b460..7fa05c605 100644
--- a/src/lib/entropy/rdrand/rdrand.cpp
+++ b/src/lib/entropy/rdrand/rdrand.cpp
@@ -7,41 +7,24 @@
 */
 
 #include <botan/internal/rdrand.h>
+#include <botan/rdrand_rng.h>
 #include <botan/cpuid.h>
 #include <botan/build.h>
 
-#if !defined(BOTAN_USE_GCC_INLINE_ASM)
-  #include <immintrin.h>
-#endif
-
 namespace Botan {
 
-void Intel_Rdrand::poll(Entropy_Accumulator& accum) {
-   if(!CPUID::has_rdrand())
-      return;
-
-   for(size_t p = 0; p != BOTAN_ENTROPY_INTEL_RNG_POLLS; ++p)
+size_t Intel_Rdrand::poll(RandomNumberGenerator& rng) {
+   if(CPUID::has_rdrand() && BOTAN_ENTROPY_INTEL_RNG_POLLS > 0)
       {
-      for(size_t i = 0; i != BOTAN_ENTROPY_RDRAND_RETRIES; ++i)
-         {
-         uint32_t r = 0;
+      RDRAND_RNG rdrand_rng;
+      secure_vector<uint8_t> buf(4 * BOTAN_ENTROPY_INTEL_RNG_POLLS);
 
-#if defined(BOTAN_USE_GCC_INLINE_ASM)
-         int cf = 0;
-
-         // Encoding of rdrand %eax
-         asm(".byte 0x0F, 0xC7, 0xF0; adcl $0,%1" :
-             "=a" (r), "=r" (cf) : "0" (r), "1" (cf) : "cc");
-#else
-         int cf = _rdrand32_step(&r);
-#endif
-         if(1 == cf)
-            {
-            accum.add(r, BOTAN_ENTROPY_ESTIMATE_HARDWARE_RNG);
-            break;
-            }
-         }
+      rdrand_rng.randomize(buf.data(), buf.size());
+      rng.add_entropy(buf.data(), buf.size());
       }
+
+   // RDRAND is used but not trusted
+   return 0;
    }
 
 }
diff --git a/src/lib/entropy/rdrand/rdrand.h b/src/lib/entropy/rdrand/rdrand.h
index 48d090775..db9de39b6 100644
--- a/src/lib/entropy/rdrand/rdrand.h
+++ b/src/lib/entropy/rdrand/rdrand.h
@@ -20,7 +20,7 @@ class Intel_Rdrand final : public Entropy_Source
    {
    public:
       std::string name() const override { return "rdrand"; }
-      void poll(Entropy_Accumulator& accum) override;
+      size_t poll(RandomNumberGenerator& rng) override;
    };
 
 }