diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/securerandom.rb | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu Jul 11 13:00:34 2013 Zachary Scott <e@zzak.io> + + * lib/securerandom.rb: Refactor conditions by Rafal Chmiel + [Fixes GH-326] https://github.com/ruby/ruby/pull/326 + Thu Jul 11 12:04:47 2013 Tanaka Akira <akr@fsij.org> * bignum.c: Don't use toom3 after once karatsuba is choosen. diff --git a/lib/securerandom.rb b/lib/securerandom.rb index 69fd2dddea..cc33a08044 100644 --- a/lib/securerandom.rb +++ b/lib/securerandom.rb @@ -51,9 +51,9 @@ module SecureRandom n = n ? n.to_int : 16 if defined? OpenSSL::Random - @pid = 0 if !defined?(@pid) + @pid = 0 unless defined?(@pid) pid = $$ - if @pid != pid + unless @pid == pid now = Time.now ary = [now.to_i, now.nsec, @pid, pid] OpenSSL::Random.random_add(ary.join("").to_s, 0.0) @@ -73,7 +73,7 @@ module SecureRandom end @has_urandom = true ret = f.read(n) - if ret.length != n + unless ret.length == n raise NotImplementedError, "Unexpected partial read from random device: only #{ret.length} for #{n} bytes" end return ret @@ -83,7 +83,7 @@ module SecureRandom end end - if !defined?(@has_win32) + unless defined?(@has_win32) begin require 'Win32API' @@ -186,7 +186,7 @@ module SecureRandom s = [random_bytes(n)].pack("m*") s.delete!("\n") s.tr!("+/", "-_") - s.delete!("=") if !padding + s.delete!("=") unless padding s end |