aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/rng/system_rng
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2018-03-14 18:58:00 -0400
committerJack Lloyd <[email protected]>2018-03-14 18:58:00 -0400
commitba8a26f17d921a2c8f757d68aade966beb9ef5f4 (patch)
tree3150f99a7b1c128034748a7d4bdd5c5af94a794c /src/lib/rng/system_rng
parent792a2bebf8fd1a4b5813680131267b77d06f6b98 (diff)
Use RtlGenRandom instead of CryptoAPI
Diffstat (limited to 'src/lib/rng/system_rng')
-rw-r--r--src/lib/rng/system_rng/info.txt11
-rw-r--r--src/lib/rng/system_rng/system_rng.cpp91
2 files changed, 23 insertions, 79 deletions
diff --git a/src/lib/rng/system_rng/info.txt b/src/lib/rng/system_rng/info.txt
index 8f25bf84c..4dc5be758 100644
--- a/src/lib/rng/system_rng/info.txt
+++ b/src/lib/rng/system_rng/info.txt
@@ -5,12 +5,9 @@ SYSTEM_RNG -> 20141202
<os_features>
dev_random,posix1
arc4random
-crypto_ng
-cryptgenrandom
+rtlgenrandom
</os_features>
-<libs>
-windows -> advapi32.lib
-winphone -> bcrypt.lib
-mingw -> advapi32
-</libs>
+<requires>
+rtlgenrandom?dyn_load
+</requires>
diff --git a/src/lib/rng/system_rng/system_rng.cpp b/src/lib/rng/system_rng/system_rng.cpp
index cec3deab1..32dabbe9f 100644
--- a/src/lib/rng/system_rng/system_rng.cpp
+++ b/src/lib/rng/system_rng/system_rng.cpp
@@ -1,25 +1,22 @@
/*
* System RNG
-* (C) 2014,2015,2017 Jack Lloyd
+* (C) 2014,2015,2017,2018 Jack Lloyd
*
* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/system_rng.h>
-#if defined(BOTAN_TARGET_OS_HAS_CRYPTGENRANDOM)
- #define NOMINMAX 1
- #define _WINSOCKAPI_ // stop windows.h including winsock.h
- #include <windows.h>
- #include <wincrypt.h>
-
-#elif defined(BOTAN_TARGET_OS_HAS_CRYPTO_NG)
- #include <bcrypt.h>
+#if defined(BOTAN_TARGET_OS_HAS_RTLGENRANDOM)
+ #include <botan/dyn_load.h>
+ #define NOMINMAX 1
+ #define _WINSOCKAPI_ // stop windows.h including winsock.h
+ #include <windows.h>
#elif defined(BOTAN_TARGET_OS_HAS_ARC4RANDOM)
#include <stdlib.h>
-#else
+#elif defined(BOTAN_TARGET_OS_HAS_DEV_RANDOM)
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -31,82 +28,32 @@ namespace Botan {
namespace {
-#if defined(BOTAN_TARGET_OS_HAS_CRYPTGENRANDOM)
+#if defined(BOTAN_TARGET_OS_HAS_RTLGENRANDOM)
class System_RNG_Impl final : public RandomNumberGenerator
{
public:
- System_RNG_Impl()
- {
- if(!CryptAcquireContext(&m_prov, nullptr, nullptr,
- BOTAN_SYSTEM_RNG_CRYPTOAPI_PROV_TYPE, CRYPT_VERIFYCONTEXT))
- throw Exception("System_RNG failed to acquire crypto provider");
- }
-
- ~System_RNG_Impl()
+ System_RNG_Impl() : m_advapi("advapi32.dll")
{
- ::CryptReleaseContext(m_prov, 0);
+ // This throws if the function is not found
+ m_rtlgenrandom = m_advapi.resolve<RtlGenRandom_f>("SystemFunction036");
}
void randomize(uint8_t buf[], size_t len) override
{
- ::CryptGenRandom(m_prov, static_cast<DWORD>(len), buf);
- }
-
- void add_entropy(const uint8_t in[], size_t length) override
- {
- /*
- There is no explicit ConsumeRandom, but all values provided in
- the call are incorporated into the state.
- */
- std::vector<uint8_t> buf(in, in + length);
- ::CryptGenRandom(m_prov, static_cast<DWORD>(buf.size()), buf.data());
+ if(m_rtlgenrandom(buf, len) == false)
+ throw Exception("RtlGenRandom failed");
}
+ void add_entropy(const uint8_t[], size_t) override { /* ignored */ }
bool is_seeded() const override { return true; }
void clear() override { /* not possible */ }
- std::string name() const override { return "cryptoapi"; }
+ std::string name() const override { return "RtlGenRandom"; }
private:
- HCRYPTPROV m_prov;
- };
+ typedef BOOL (*RtlGenRandom_f)(PVOID, ULONG);
-#elif defined(BOTAN_TARGET_OS_HAS_CRYPTO_NG)
-
-class System_RNG_Impl final : public RandomNumberGenerator
- {
- public:
- System_RNG_Impl()
- {
- NTSTATUS ret = ::BCryptOpenAlgorithmProvider(&m_prov,
- BCRYPT_RNG_ALGORITHM,
- MS_PRIMITIVE_PROVIDER, 0);
- if(ret != STATUS_SUCCESS)
- throw Exception("System_RNG failed to acquire crypto provider");
- }
-
- ~System_RNG_Impl()
- {
- ::BCryptCloseAlgorithmProvider(m_prov, 0);
- }
-
- void randomize(uint8_t buf[], size_t len) override
- {
- ::BCryptGenRandom(m_prov, static_cast<PUCHAR>(buf), static_cast<ULONG>(len), 0);
- }
-
- void add_entropy(const uint8_t in[], size_t length) override
- {
- /*
- There is a flag BCRYPT_RNG_USE_ENTROPY_IN_BUFFER to provide
- entropy inputs, but it is ignored in Windows 8 and later.
- */
- }
-
- bool is_seeded() const override { return true; }
- void clear() override { /* not possible */ }
- std::string name() const override { return "crypto_ng"; }
- private:
- BCRYPT_ALG_HANDLE m_handle;
+ Dynamically_Loaded_Library m_advapi;
+ RtlGenRandom_f m_rtlgenrandom;
};
#elif defined(BOTAN_TARGET_OS_HAS_ARC4RANDOM)
@@ -127,7 +74,7 @@ class System_RNG_Impl final : public RandomNumberGenerator
std::string name() const override { return "arc4random"; }
};
-#else
+#elif defined(BOTAN_TARGET_OS_HAS_DEV_RANDOM)
// Read a random device