sysrandom 1.0.0-java → 1.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e24cd46b6417b143899bcec5491ded930fdff1b9
-  data.tar.gz: b4c37eded4ec30f2860538b3db047f3b12b5db78
+  metadata.gz: 53ffc040ccb76967f1491be3cb8c5045a4614514
+  data.tar.gz: e27d25c036fd48d81aafe909c3b35a00a32b6d9d
 SHA512:
-  metadata.gz: d91f8eb67cfa6c2a070fd06e7e15de5379e172d33d248eecce50e592fc8b1ebf1ab9d0bc22cfaef5380c34da9b8a8f979ee466406ece07270c158bead8976ee9
-  data.tar.gz: 708ede372c5493228dcdc63237c398a814df9b4ce47baac08dce981397346f945580cf29931c1dcd6cac2ff9afdb0c07b3d3ae208ae6e519499e3fe630ca40f6
+  metadata.gz: f42b9b60f93187eb9c592c11a6e477cb901849659a73d3d1724b3d0ea4703b8fb926754d3322d5b278a7ad41fad46ee811ff71f8a0207e8665a0f724faddcf60
+  data.tar.gz: 3755c3e7ad2e043519e2e36e0096d71c60c8023fd0772d5169312c9d6db27e994233cc56fbae3d1a968afbca97c16a70c789304ab6a576a0dd36cd072b40b8c8

data/.rubocop.yml

@@ -26,9 +26,3 @@ Metrics/MethodLength:
 
 Metrics/AbcSize:
   Max: 20
-
-AllCops:
-  Include:
-    - '**/Rakefile'
-  Exclude:
-    - 'spec/**/*'

data/CHANGES.md

@@ -1,3 +1,18 @@
+## 1.0.1 (2016-05-29)
+
+* [#11](https://github.com/cryptosphere/sysrandom/pull/11)
+  Use NativePRNGNonBlocking for JRuby if available.
+  ([@coda])
+
+* [#8](https://github.com/cryptosphere/sysrandom/pull/8)
+  Upstream libsodium change: wait for `/dev/random` to be seeded before reading from `/dev/urandom`.
+  ([@tarcieri])
+
+
 ## 1.0.0 (2016-05-28)
 
 * Initial release.
+
+
+[@tarcieri]: https://github.com/tarcieri
+[@coda]: https://github.com/coda

data/README.md

@@ -6,10 +6,19 @@
 
 Secure random number generation for Ruby using system RNG facilities e.g. `/dev/urandom`, `getrandom(2)`
 
-## Description
+## Why?
+
+System/OS-level random number generators like `/dev/urandom` and `getrandom(2)`
+provide the best option for generating cryptographically secure random numbers.
+
+Ruby's built-in SecureRandom does not provide this, but instead uses OpenSSL's
+userspace RNG. This has been a [source of vulnerabilities][emboss] in Ruby, and
+an [open Ruby bug ticket][bug] contains much discussion on the issue with no
+clear path to resolution.
 
-[Concerns have been raised][concerns] about the current implementation of Ruby's built-in
-`SecureRandom` functionality, as it presently leverages the poorly reputed OpenSSL RNG.
+This gem aims to solve the problem.
+
+## Description
 
 In cryptography circles, [the prevailing advice is to use OS RNG functionality][/dev/urandom],
 namely `/dev/urandom` or equivalent calls which use an OS-level CSPRNG to
@@ -22,21 +31,22 @@ cryptographic keys, initialization vectors, or nonces.
 
 The following random number generators are utilized:
 
-| OS      | RNG                                                               |
-|---------|-------------------------------------------------------------------|
-| Linux   | [getrandom(2)] if available, otherwise [/dev/urandom]             |
-| Windows | [RtlGenRandom]                                                    |
-| OpenBSD | [arc4random(3)] with ChaCha20 CSPRNG (not RC4)                    |
-| JRuby   | [SecureRandom.getInstanceStrong] if available, otherwise SHA1PRNG |
-| Others  | [/dev/urandom]                                                    |
+| Platform | RNG                                                    |
+|----------|--------------------------------------------------------|
+| Linux    | [getrandom(2)] if available, otherwise [/dev/urandom]  |
+| Windows  | [RtlGenRandom] CryptGenRandom without CryptoAPI deps   |
+| OpenBSD  | [arc4random(3)] with ChaCha20 CSPRNG (not RC4)         |
+| JRuby    | [NativePRNGNonBlocking] on Java 8, otherwise SHA1PRNG  |
+| Others   | [/dev/urandom]                                         |
 
-[concerns]:      https://bugs.ruby-lang.org/issues/9569
+[emboss]:        https://emboss.github.io/blog/2013/08/21/openssl-prng-is-not-really-fork-safe/
+[bug]:           https://bugs.ruby-lang.org/issues/9569
 [libsodium]:     https://github.com/jedisct1/libsodium
 [getrandom(2)]:  http://man7.org/linux/man-pages/man2/getrandom.2.html
 [/dev/urandom]:  http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers/
 [RtlGenRandom]:  https://msdn.microsoft.com/en-us/library/windows/desktop/aa387694(v=vs.85).aspx
 [arc4random(3)]: http://man.openbsd.org/arc4random.3
-[SecureRandom.getInstanceStrong]: https://docs.oracle.com/javase/8/docs/api/java/security/SecureRandom.html#getInstanceStrong--
+[NativePRNGNonBlocking]: https://tersesystems.com/2015/12/17/the-right-way-to-use-securerandom/
 
 ## Supported Platforms
 

data/ext/sysrandom/randombytes_sysrandom.c

@@ -1,5 +1,5 @@
 /*
- * __randombytes_sysrandom.c: adapted from libsodium
+ * randombytes_sysrandom.c: adapted from libsodium
  * Copyright (c) 2013-2016 Frank Denis <j at pureftpd dot org>
  * https://github.com/jedisct1/libsodium
  */
@@ -12,6 +12,7 @@
 #endif
 #ifdef __linux__
 # include <sys/syscall.h>
+# include <poll.h>
 #endif
 
 #include <assert.h>
@@ -102,6 +103,33 @@ safe_read(const int fd, void * const buf_, size_t size)
 #endif
 
 #ifndef _WIN32
+# if defined(__linux__) && !defined(USE_BLOCKING_RANDOM)
+static int
+randombytes_block_on_dev_random(void)
+{
+    struct pollfd pfd;
+    int           fd;
+    int           pret;
+
+    fd = open("/dev/random", O_RDONLY);
+    if (fd == -1) {
+        return 0;
+    }
+    pfd.fd = fd;
+    pfd.events = POLLIN;
+    pfd.revents = 0;
+    do {
+        pret = poll(&pfd, 1, -1);
+    } while (pret < 0 && (errno == EINTR || errno == EAGAIN));
+    if (pret != 1) {
+        (void) close(fd);
+        errno = EIO;
+        return -1;
+    }
+    return close(fd);
+}
+# endif
+
 static int
 __randombytes_sysrandom_random_dev_open(void)
 {
@@ -116,6 +144,11 @@ __randombytes_sysrandom_random_dev_open(void)
     const char **      device = devices;
     int                fd;
 
+# if defined(__linux__) && !defined(USE_BLOCKING_RANDOM)
+    if (randombytes_block_on_dev_random() != 0) {
+        return -1;
+    }
+# endif
     do {
         fd = open(*device, O_RDONLY);
         if (fd != -1) {
@@ -145,7 +178,7 @@ __randombytes_sysrandom_random_dev_open(void)
 /* LCOV_EXCL_STOP */
 }
 
-# ifdef SYS_getrandom
+# if defined(SYS_getrandom) && defined(__NR_getrandom)
 static int
 _randombytes_linux_getrandom(void * const buf, const size_t size)
 {
@@ -186,7 +219,7 @@ __randombytes_sysrandom_init(void)
 {
     const int     errno_save = errno;
 
-# ifdef SYS_getrandom
+# if defined(SYS_getrandom) && defined(__NR_getrandom)
     {
         unsigned char fodder[16];
 
@@ -240,7 +273,7 @@ __randombytes_sysrandom_buf(void * const buf, const size_t size)
     assert(size <= ULONG_LONG_MAX);
 #endif
 #ifndef _WIN32
-# ifdef SYS_getrandom
+# if defined(SYS_getrandom) && defined(__NR_getrandom)
     if (stream.getrandom_available != 0) {
         if (randombytes_linux_getrandom(buf, size) != 0) {
             abort();

data/lib/sysrandom.rb

@@ -12,10 +12,13 @@ module Sysrandom
   if defined?(JRUBY_VERSION)
     require "java"
 
-    if java.security.SecureRandom.respond_to?(:getInstanceStrong)
-      @_java_secure_random = java.security.SecureRandom.getInstanceStrong
-    else
-      @_java_secure_random = java.security.SecureRandom.getInstance("SHA1PRNG")
+    begin
+      # Try to use the new NativePRNGNonBlocking algorithm introduced in Java 8.
+      @_java_secure_random = java.security.SecureRandom.getInstance("NativePRNGNonBlocking")
+    rescue
+      # If unavailable, fall back to the default configuration. This will
+      # probably be SHA1PRNG, but it depends on the JRE's configuration.
+      @_java_secure_random = java.security.SecureRandom.new
     end
 
     # Random uint32, used by random_number. The C extension provides an equivalent method

data/lib/sysrandom/version.rb

@@ -1,3 +1,3 @@
 module Sysrandom
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sysrandom
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: java
 authors:
 - Tony Arcieri
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-05-29 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies: []
 description: Sysrandom generates secure random numbers using /dev/urandom, getrandom(), etc
 email: