From a8acc95f4c3b3b6ead0586139e4205326e0bc029 Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 22 Apr 2016 15:30:27 +0000 Subject: merge revision(s) 54144,54699: [Backport #12139] * lib/securerandom.rb (gen_random): to avoid blocking on Windows. On Windows OpenSSL RAND_bytes (underlying implementation is RAND_poll in crypto/rand/rand_win.c) may be blocked at NetStatisticsGet. https://wiki.openssl.org/index.php/Random_Numbers#Windows_Issues Instead of this, use Random.raw_seed directory (whose implementation CryptGenRandom is one of the source of entropy of RAND_poll on Windows). https://wiki.openssl.org/index.php/Random_Numbers Note: CryptGenRandom function is PRNG and doesn't check its entropy, so it won't block. [Bug #12139] https://msdn.microsoft.com/ja-jp/library/windows/desktop/aa379942.aspx https://tools.ietf.org/html/rfc4086#section-7.1.3 https://eprint.iacr.org/2007/419.pdf http://www.cs.huji.ac.il/~dolev/pubs/thesis/msc-thesis-leo.pdf Instead of this, use Random.raw_seed directly (whose implementation git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54713 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/securerandom.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/securerandom.rb b/lib/securerandom.rb index b08b62b746..596d8ed389 100644 --- a/lib/securerandom.rb +++ b/lib/securerandom.rb @@ -48,7 +48,7 @@ end # module SecureRandom - if defined? OpenSSL::Random + if defined?(OpenSSL::Random) && /mswin|mingw/ !~ RUBY_PLATFORM def self.gen_random(n) @pid = 0 unless defined?(@pid) pid = $$ -- cgit v1.2.3