summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-13 04:10:25 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-13 04:10:25 +0000
commitc620acaced507cd0d61e7e9d7acbeca9cb99f158 (patch)
treedc454966877a5c48c2412a44c9d69213e01111f2 /lib
parent54eb4c1930f81998efe64661e1a6d82df915e9ba (diff)
* lib/securerandom.rb: skip Win32 libraries in SecureRandom if
OpenSSL::Random is available. https://github.com/ruby/ruby/pull/848 [Bug #10948] [Bug #10995] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/securerandom.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/securerandom.rb b/lib/securerandom.rb
index 3e932f6b0e..c26bf50b02 100644
--- a/lib/securerandom.rb
+++ b/lib/securerandom.rb
@@ -40,7 +40,7 @@ end
# p SecureRandom.random_bytes(10) #=> "\016\t{\370g\310pbr\301"
# p SecureRandom.random_bytes(10) #=> "\323U\030TO\234\357\020\a\337"
module SecureRandom
- if /mswin|mingw/ =~ RUBY_PLATFORM
+ if !defined?(OpenSSL::Random) && /mswin|mingw/ =~ RUBY_PLATFORM
require "fiddle/import"
module AdvApi32 # :nodoc: