/*
- * Copyright 2016 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <random>
#include <array>
-#include <glog/logging.h>
#include <folly/CallOnce.h>
#include <folly/File.h>
#include <folly/FileUtil.h>
+#include <folly/SingletonThreadLocal.h>
#include <folly/ThreadLocal.h>
#include <folly/portability/SysTime.h>
#include <folly/portability/Unistd.h>
+#include <glog/logging.h>
#ifdef _MSC_VER
# include <wincrypt.h>
static folly::once_flag flag;
static HCRYPTPROV cryptoProv;
folly::call_once(flag, [&] {
- if (!CryptAcquireContext(&cryptoProv, nullptr, nullptr, PROV_RSA_FULL, 0)) {
+ if (!CryptAcquireContext(
+ &cryptoProv,
+ nullptr,
+ nullptr,
+ PROV_RSA_FULL,
+ CRYPT_VERIFYCONTEXT)) {
if (GetLastError() == NTE_BAD_KEYSET) {
// Mostly likely cause of this is that no key container
// exists yet, so try to create one.
void getSlow(unsigned char* data, size_t size);
inline size_t remaining() const {
- return buffer_.get() + bufferSize_ - ptr_;
+ return size_t(buffer_.get() + bufferSize_ - ptr_);
}
const size_t bufferSize_;
ptr_ += size;
}
+struct RandomTag {};
-} // namespace
+} // namespace
void Random::secureRandom(void* data, size_t size) {
- static ThreadLocal<BufferedRandomDevice> bufferedRandomDevice;
- bufferedRandomDevice->get(data, size);
+ static SingletonThreadLocal<BufferedRandomDevice, RandomTag>
+ bufferedRandomDevice;
+ bufferedRandomDevice.get().get(data, size);
}
class ThreadLocalPRNG::LocalInstancePRNG {
public:
- LocalInstancePRNG() : rng(Random::create()) { }
+ LocalInstancePRNG() : rng(Random::create()) {}
Random::DefaultGenerator rng;
};
ThreadLocalPRNG::ThreadLocalPRNG() {
- static folly::ThreadLocal<ThreadLocalPRNG::LocalInstancePRNG> localInstance;
- local_ = localInstance.get();
+ static SingletonThreadLocal<ThreadLocalPRNG::LocalInstancePRNG, RandomTag>
+ localInstancePRNG;
+ local_ = &localInstancePRNG.get();
}
uint32_t ThreadLocalPRNG::getImpl(LocalInstancePRNG* local) {
return local->rng();
}
-
}