aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-11-25 07:14:46 +0000
committerlloyd <[email protected]>2008-11-25 07:14:46 +0000
commit8846b510e3f8620dfba2c53daa62879667875cde (patch)
tree0f0de3d89c57fb25a906f08207eb1fa71e1f5662
parenta8696ac0c6a8a20b1dae79fb0670ea9885767935 (diff)
If the read succeceed in EGD_EntropySource::slow_poll, the loop would
just continue on instead of returning the length of the buffer recv'ed from EGD.
-rw-r--r--doc/log.txt1
-rw-r--r--src/entropy/egd/es_egd.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/log.txt b/doc/log.txt
index 9d9825494..4c2fbc373 100644
--- a/doc/log.txt
+++ b/doc/log.txt
@@ -3,6 +3,7 @@
- Wrap private structs in SSE2 SHA-1 code in anonymous namespace
- Change configure.pl's CPU autodetection output to be more consistent
- Disable using OpenSSL's AES due to crashes
+ - Fix bug preventing EGD entropy poller from working
- Fix warning in /proc walking entropy poller
- Fix compilation with IBM XLC for Cell 0.9
- Fix integer overflow in Pooling_Allocator::get_more_core (bug id #27)
diff --git a/src/entropy/egd/es_egd.cpp b/src/entropy/egd/es_egd.cpp
index f493de33b..736d49a6f 100644
--- a/src/entropy/egd/es_egd.cpp
+++ b/src/entropy/egd/es_egd.cpp
@@ -104,6 +104,8 @@ u32bit EGD_EntropySource::slow_poll(byte output[], u32bit length)
if(count < 0)
return 0;
+
+ return static_cast<u32bit>(count);
}
return 0;