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

which recently landed on master.

1 files changed, 18 insertions, 16 deletions

diff --git a/src/lib/entropy/rdseed/rdseed.cpp b/src/lib/entropy/rdseed/rdseed.cpp
index 2ba2075cc..325edfd41 100644
--- a/src/lib/entropy/rdseed/rdseed.cpp
+++ b/src/lib/entropy/rdseed/rdseed.cpp
@@ -15,32 +15,34 @@
 
 namespace Botan {
 
-void Intel_Rdseed::poll(Entropy_Accumulator& accum) {
-   if(!CPUID::has_rdseed())
-      return;
-
-   for(size_t p = 0; p != BOTAN_ENTROPY_INTEL_RNG_POLLS; ++p)
+size_t Intel_Rdseed::poll(RandomNumberGenerator& rng) {
+   if(CPUID::has_rdseed())
       {
-      for(size_t i = 0; i != BOTAN_ENTROPY_RDSEED_RETRIES; ++i)
+      for(size_t p = 0; p != BOTAN_ENTROPY_INTEL_RNG_POLLS; ++p)
          {
-         uint32_t r = 0;
+         for(size_t i = 0; i != BOTAN_ENTROPY_RDSEED_RETRIES; ++i)
+            {
+            uint32_t r = 0;
 
 #if defined(BOTAN_USE_GCC_INLINE_ASM)
-         int cf = 0;
+            int cf = 0;
 
-         // Encoding of rdseed %eax
-         asm(".byte 0x0F, 0xC7, 0xF8; adcl $0,%1" :
-             "=a" (r), "=r" (cf) : "0" (r), "1" (cf) : "cc");
+            // Encoding of rdseed %eax
+            asm(".byte 0x0F, 0xC7, 0xF8; adcl $0,%1" :
+                "=a" (r), "=r" (cf) : "0" (r), "1" (cf) : "cc");
 #else
-         int cf = _rdseed32_step(&r);
+            int cf = _rdseed32_step(&r);
 #endif
-         if(1 == cf)
-            {
-            accum.add(r, BOTAN_ENTROPY_ESTIMATE_HARDWARE_RNG);
-            break;
+            if(1 == cf)
+               {
+               rng.add_entropy_T(r);
+               break;
+               }
             }
          }
       }
+
+   return 0;
    }
 
 }