diff options
| author | Jack Lloyd <[email protected]> | 2016-10-04 04:43:07 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-10-04 04:43:07 -0400 |
| commit | 5a71e9a9e5a3b9452c94edcc2b5b0806bee38239 (patch) | |
| tree | 6ac480f6d639991600e9f3abf51b8a1195cbef89 | |
| parent | ab2842d6f28680b1cac18d5ff6b70b395d1ffb65 (diff) | |
Fix entropy source selection logic on Windows
Fixes GH #644
| -rw-r--r-- | doc/news.rst | 4 | ||||
| -rw-r--r-- | src/lib/entropy/entropy_srcs.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/news.rst b/doc/news.rst index a764d75fb..d831d5b10 100644 --- a/doc/news.rst +++ b/doc/news.rst @@ -4,6 +4,10 @@ Release Notes Version 1.11.33, Not Yet Released ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +* Fix entropy source selection bug on Windows, which caused the + CryptoAPI entropy source to be not available under its normal name + "win32_cryptoapi" but instead "dev_random". GH #644 + Version 1.11.32, 2016-09-28 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/lib/entropy/entropy_srcs.cpp b/src/lib/entropy/entropy_srcs.cpp index 22d2e5e4b..ad84709a5 100644 --- a/src/lib/entropy/entropy_srcs.cpp +++ b/src/lib/entropy/entropy_srcs.cpp @@ -95,11 +95,12 @@ std::unique_ptr<Entropy_Source> Entropy_Source::create(const std::string& name) { #if defined(BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM) return std::unique_ptr<Entropy_Source>(new Device_EntropySource(BOTAN_SYSTEM_RNG_POLL_DEVICES)); +#endif } if(name == "win32_cryptoapi") { -#elif defined(BOTAN_HAS_ENTROPY_SRC_CAPI) +#if defined(BOTAN_HAS_ENTROPY_SRC_CAPI) return std::unique_ptr<Entropy_Source>(new Win32_CAPI_EntropySource); #endif } |