aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-31 05:07:56 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-31 05:07:56 +0000
commit7a4feec795ac8622edd099ed8b82b6230dc031be (patch)
tree1b4e615e65d0317dc40b19cc774426b07abae8ff
parent9eb141196b0111e12e7d54407bc30bbe3123a787 (diff)
downloadruby-7a4feec795ac8622edd099ed8b82b6230dc031be.tar.gz
* lib/securerandom.rb (random_bytes): Use Process.clock_gettime.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/securerandom.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 72557a12ec..8e2b7bf304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Aug 31 14:07:11 2013 Tanaka Akira <akr@fsij.org>
+
+ * lib/securerandom.rb (random_bytes): Use Process.clock_gettime.
+
Sat Aug 31 00:25:15 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/encoding.h (rb_{ascii8bit,utf8,usascii}_encindex): get
diff --git a/lib/securerandom.rb b/lib/securerandom.rb
index cc33a08044..b1603b4ca9 100644
--- a/lib/securerandom.rb
+++ b/lib/securerandom.rb
@@ -54,8 +54,8 @@ module SecureRandom
@pid = 0 unless defined?(@pid)
pid = $$
unless @pid == pid
- now = Time.now
- ary = [now.to_i, now.nsec, @pid, pid]
+ now = Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond)
+ ary = [now, @pid, pid]
OpenSSL::Random.random_add(ary.join("").to_s, 0.0)
@pid = pid
end