[prev in list] [next in list] [prev in thread] [next in thread]
List: cfe-commits
Subject: Re: [PATCH] libc++: add NaCl and PNaCl support for std::random_device
From: JF Bastien <jfb () chromium ! org>
Date: 2014-11-29 20:00:08
Message-ID: 1ff1f6371fc551b8df3da58b5fcf1453 () localhost ! localdomain
[Download RAW message or body]
- Add _LIBCPP_USING_NACL_RANDOM to __config, and use that instead of __na=
tive_client__.
http://reviews.llvm.org/D6442
Files:
include/__config
include/random
src/random.cpp
test/numerics/rand/rand.device/ctor.pass.cpp
["D6442.16749.patch" (text/x-patch)]
Index: include/__config
===================================================================
--- include/__config
+++ include/__config
@@ -111,6 +111,13 @@
# endif
#endif // __sun__
+#if defined(__native_client__)
+ // NaCl's sandbox (which PNaCl also runs in) doesn't allow filesystem access,
+ // including accesses to the special files under /dev. C++11's
+ // std::random_device is instead exposed through a NaCl syscall.
+# define _LIBCPP_USING_NACL_RANDOM 1
+#endif // defined(__native_client__)
+
#if !defined(_LIBCPP_LITTLE_ENDIAN) || !defined(_LIBCPP_BIG_ENDIAN)
# include <endian.h>
# if __BYTE_ORDER == __LITTLE_ENDIAN
Index: include/random
===================================================================
--- include/random
+++ include/random
@@ -3475,9 +3475,9 @@
class _LIBCPP_TYPE_VIS random_device
{
-#if !defined(_WIN32)
+#if !defined(_WIN32) || defined(_LIBCPP_USING_NACL_RANDOM)
int __f_;
-#endif // defined(_WIN32)
+#endif // !defined(_WIN32) || defined(_LIBCPP_USING_NACL_RANDOM)
public:
// types
typedef unsigned result_type;
Index: src/random.cpp
===================================================================
--- src/random.cpp
+++ src/random.cpp
@@ -11,23 +11,27 @@
// Must be defined before including stdlib.h to enable rand_s().
#define _CRT_RAND_S
#include <stdio.h>
-#endif
+#endif // defined(_WIN32)
#include "random"
#include "system_error"
-#ifdef __sun__
+#if defined(__sun__)
#define rename solaris_headers_are_broken
-#endif
+#endif // defined(__sun__)
#if !defined(_WIN32)
#include <fcntl.h>
#include <unistd.h>
-#endif // defined(_WIN32)
+#endif // !defined(_WIN32)
#include <errno.h>
+#if defined(_LIBCPP_USING_NACL_RANDOM)
+#include <nacl/nacl_random.h>
+#endif // defined(_LIBCPP_USING_NACL_RANDOM)
_LIBCPP_BEGIN_NAMESPACE_STD
#if defined(_WIN32)
+
random_device::random_device(const string&)
{
}
@@ -45,7 +49,39 @@
__throw_system_error(err, "random_device rand_s failed.");
return r;
}
-#else
+
+#elif defined(_LIBCPP_USING_NACL_RANDOM)
+
+random_device::random_device(const string& __token)
+{
+ if (__token != "/dev/urandom")
+ __throw_system_error(ENODEV, ("random device not supported " + __token).c_str());
+ int error = nacl_secure_random_init();
+ if (error)
+ __throw_system_error(error, ("random device failed to open " + __token).c_str());
+}
+
+random_device::~random_device()
+{
+}
+
+unsigned
+random_device::operator()()
+{
+ unsigned r;
+ size_t n = sizeof(r);
+ char* p = reinterpret_cast<char*>(&r);
+ size_t bytes_written;
+ int error = nacl_secure_random(&r, n, &bytes_written);
+ if (error != 0)
+ __throw_system_error(error, "random_device failed getting bytes");
+ else if (bytes_written != n)
+ __throw_runtime_error("random_device failed to obtain enough bytes");
+ return r;
+}
+
+#else // !defined(_WIN32) && !defined(_LIBCPP_USING_NACL_RANDOM)
+
random_device::random_device(const string& __token)
: __f_(open(__token.c_str(), O_RDONLY))
{
@@ -80,7 +116,8 @@
}
return r;
}
-#endif // defined(_WIN32)
+
+#endif // defined(_WIN32) || defined(_LIBCPP_USING_NACL_RANDOM)
double
random_device::entropy() const _NOEXCEPT
Index: test/numerics/rand/rand.device/ctor.pass.cpp
===================================================================
--- test/numerics/rand/rand.device/ctor.pass.cpp
+++ test/numerics/rand/rand.device/ctor.pass.cpp
@@ -11,39 +11,75 @@
// class random_device;
-// explicit random_device(const string& token = "/dev/urandom");
+// explicit random_device(const string& token = implementation-defined);
+
+// For the following ctors, the standard states: "The semantics and default
+// value of the token parameter are implementation-defined". Implementations
+// therefore aren't required to accept any string, but the default shouldn't
+// throw.
#include <random>
#include <cassert>
#include <unistd.h>
-int main()
-{
- try
- {
- std::random_device r("wrong file");
- assert(false);
- }
- catch (const std::system_error& e)
- {
- }
- {
- std::random_device r;
- }
- {
- int ec;
- ec = close(STDIN_FILENO);
- assert(!ec);
- ec = close(STDOUT_FILENO);
- assert(!ec);
- ec = close(STDERR_FILENO);
- assert(!ec);
- std::random_device r;
- }
- {
- std::random_device r("/dev/urandom");;
- }
- {
- std::random_device r("/dev/random");;
- }
+bool is_valid_random_device(const std::string &token) {
+#if defined(_WIN32)
+ return true;
+#elif defined(_LIBCPP_USING_NACL_RANDOM)
+ return token == "/dev/urandom";
+#else // !defined(_WIN32) && !defined(_LIBCPP_USING_NACL_RANDOM)
+ // Not an exhaustive list: they're the only tokens that are tested below.
+ return token == "/dev/urandom" || token == "/dev/random";
+#endif // defined(_WIN32) || defined(_LIBCPP_USING_NACL_RANDOM)
+}
+
+void check_random_device_valid(const std::string &token) {
+ std::random_device r(token);
+}
+
+void check_random_device_invalid(const std::string &token) {
+ try {
+ std::random_device r(token);
+ assert(false);
+ } catch (const std::system_error &e) {
+ }
+}
+
+int main() {
+ { std::random_device r; }
+
+ {
+ int ec;
+ ec = close(STDIN_FILENO);
+ assert(!ec);
+ ec = close(STDOUT_FILENO);
+ assert(!ec);
+ ec = close(STDERR_FILENO);
+ assert(!ec);
+ std::random_device r;
+ }
+
+ {
+ std::string token = "wrong file";
+ if (is_valid_random_device(token))
+ check_random_device_valid(token);
+ else
+ check_random_device_invalid(token);
+ }
+
+ {
+ std::string token = "/dev/urandom";
+ if (is_valid_random_device(token))
+ check_random_device_valid(token);
+ else
+ check_random_device_invalid(token);
+ }
+
+ {
+ std::string token = "/dev/random";
+ if (is_valid_random_device(token))
+ check_random_device_valid(token);
+ else
+ check_random_device_invalid(token);
+ }
}
_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic