diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-29 15:01:20 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-29 15:01:20 +0000 |
| commit | 31eb19bbb66480f65defe1d00df42abe52f109dd (patch) | |
| tree | 2915428d0a1eb4baed660433000f605855e2e6b2 | |
| parent | d93746490d15deb4bdf35a47348106a41338002c (diff) | |
* lib/securerandom.rb: call OpenSSL::Random.seed at the
SecureRandom.random_bytes call.
based on the patch by Masahiro Tomita. [ruby-dev:44270]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/securerandom.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Jul 29 23:56:32 2011 Tanaka Akira <akr@fsij.org> + + * lib/securerandom.rb: call OpenSSL::Random.seed at the + SecureRandom.random_bytes call. + based on the patch by Masahiro Tomita. [ruby-dev:44270] + Fri Jul 29 23:53:48 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * array.c (rb_ary_set_len): new function to set array length. diff --git a/lib/securerandom.rb b/lib/securerandom.rb index d238a35406..04e8bc205e 100644 --- a/lib/securerandom.rb +++ b/lib/securerandom.rb @@ -57,7 +57,7 @@ module SecureRandom n ||= 16 if defined? OpenSSL::Random - @pid = $$ if !defined?(@pid) + @pid = 0 if !defined?(@pid) pid = $$ if @pid != pid now = Time.now |