summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-30 20:29:22 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-30 20:29:22 +0000
commit7104a473ea77fa34ffbf831b64b94d0e58cb68f0 (patch)
tree2fa4b90eba141fda2271c28dddfc76198af20caa
parent07083767e9cf500b31670fe0d5dd55a162f0c520 (diff)
* lib/securerandom.rb (SecureRandom::gen_random): use /dev/urandom
for initialize OpenSSL's rand. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/securerandom.rb4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e3ece8073f..a9d9aac68b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 22 00:12:33 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * lib/securerandom.rb (SecureRandom::gen_random): use /dev/urandom
+ for initialize OpenSSL's rand.
+
Wed Oct 21 12:10:04 2015 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* ext/openssl/ossl_rand.c (ossl_rand_bytes): RAND_bytes could
diff --git a/lib/securerandom.rb b/lib/securerandom.rb
index f53087b954..b08b62b746 100644
--- a/lib/securerandom.rb
+++ b/lib/securerandom.rb
@@ -56,6 +56,10 @@ module SecureRandom
now = Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond)
ary = [now, @pid, pid]
OpenSSL::Random.random_add(ary.join("").to_s, 0.0)
+ seed = Random.raw_seed(16)
+ if (seed)
+ OpenSSL::Random.random_add(seed, 16)
+ end
@pid = pid
end
return OpenSSL::Random.random_bytes(n)