aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-01-28 23:11:19 +0000
committerlloyd <[email protected]>2009-01-28 23:11:19 +0000
commit99a4f3a728648989878dd8fa6b7cc7188ebcbdad (patch)
treee6d6566eb9b7768446652ec96dee7aea23242691
parent89b72bf90264acc6cb84ee424e29ec4bd0e7539e (diff)
Compilation fixes for the Win32 entropy sources.
-rw-r--r--src/entropy/cryptoapi_rng/es_capi.cpp4
-rw-r--r--src/entropy/win32_stats/es_win32.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/entropy/cryptoapi_rng/es_capi.cpp b/src/entropy/cryptoapi_rng/es_capi.cpp
index 7cc4d015b..0cad79288 100644
--- a/src/entropy/cryptoapi_rng/es_capi.cpp
+++ b/src/entropy/cryptoapi_rng/es_capi.cpp
@@ -59,11 +59,11 @@ void Win32_CAPI_EntropySource::poll(Entropy_Accumulator& accum)
{
CSP_Handle csp(prov_types[j]);
- u32bit got = csp.gen_random(io_buffer.begin(), io_buffer.length());
+ u32bit got = csp.gen_random(io_buffer.begin(), io_buffer.size());
if(got)
{
- accum.add(io_buffer.begin(), io_buffer.length(), 8);
+ accum.add(io_buffer.begin(), io_buffer.size(), 8);
break;
}
}
diff --git a/src/entropy/win32_stats/es_win32.cpp b/src/entropy/win32_stats/es_win32.cpp
index 0c17f7b02..75513fa4c 100644
--- a/src/entropy/win32_stats/es_win32.cpp
+++ b/src/entropy/win32_stats/es_win32.cpp
@@ -23,7 +23,7 @@ void Win32_EntropySource::poll(Entropy_Accumulator& accum)
accum.add(GetMessageTime(), 0);
accum.add(GetInputState(), 0);
accum.add(GetCurrentProcessId(), 0);
- accum.add(GetCurrentThreadId() 0);
+ accum.add(GetCurrentThreadId(), 0);
SYSTEM_INFO sys_info;
GetSystemInfo(&sys_info);
@@ -42,7 +42,7 @@ void Win32_EntropySource::poll(Entropy_Accumulator& accum)
LARGE_INTEGER perf_counter;
QueryPerformanceCounter(&perf_counter);
- accum.add(perf_count, 0);
+ accum.add(perf_counter, 0);
/*
Now use the Tooltip library to iterate throug various objects on