nagachika	2015-04-13 13:10:25 +0900 (Mon, 13 Apr 2015)

  New Revision: 50281

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50281

  Log:
    * lib/securerandom.rb: skip Win32 libraries in SecureRandom if
      OpenSSL::Random is available.
      https://github.com/ruby/ruby/pull/848 [Bug #10948] [Bug #10995]

  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/lib/securerandom.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 50280)
+++ ruby_2_2/ChangeLog	(revision 50281)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Apr 13 13:03:33 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* lib/securerandom.rb: skip Win32 libraries in SecureRandom if
+	  OpenSSL::Random is available.
+	  https://github.com/ruby/ruby/pull/848 [Bug #10948] [Bug #10995]
+
 Mon Apr 13 00:49:56 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (arg): fix segfault by null caused by syntax error.
Index: ruby_2_2/lib/securerandom.rb
===================================================================
--- ruby_2_2/lib/securerandom.rb	(revision 50280)
+++ ruby_2_2/lib/securerandom.rb	(revision 50281)
@@ -40,7 +40,7 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/securerandom.rb#L40
 #   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:
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50280)
+++ ruby_2_2/version.h	(revision 50281)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.2"
 #define RUBY_RELEASE_DATE "2015-04-13"
-#define RUBY_PATCHLEVEL 93
+#define RUBY_PATCHLEVEL 94
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 4

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/