nagachika	2016-04-06 00:33:58 +0900 (Wed, 06 Apr 2016)

  New Revision: 54491

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

  Log:
    merge revision(s) 53419: [Backport #11940]
    
    * lib/rubygems/security.rb (DIGEST_ALGORITHM, KEY_ALGORITHM):
      should check same name as the used constants.
      [ruby-core:72674] [Bug #11940]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/lib/rubygems/security.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54490)
+++ ruby_2_3/ChangeLog	(revision 54491)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Wed Apr  6 00:33:45 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/rubygems/security.rb (DIGEST_ALGORITHM, KEY_ALGORITHM):
+	  should check same name as the used constants.
+	  [ruby-core:72674] [Bug #11940]
+
 Mon Apr  4 00:31:51 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (compile_massign_lhs): when index ends with splat,
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54490)
+++ ruby_2_3/version.h	(revision 54491)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
-#define RUBY_RELEASE_DATE "2016-04-04"
-#define RUBY_PATCHLEVEL 73
+#define RUBY_RELEASE_DATE "2016-04-06"
+#define RUBY_PATCHLEVEL 74
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 6
 
 #include "ruby/version.h"
 
Index: ruby_2_3/lib/rubygems/security.rb
===================================================================
--- ruby_2_3/lib/rubygems/security.rb	(revision 54490)
+++ ruby_2_3/lib/rubygems/security.rb	(revision 54491)
@@ -340,7 +340,7 @@ module Gem::Security https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/rubygems/security.rb#L340
   # Digest algorithm used to sign gems
 
   DIGEST_ALGORITHM =
-    if defined?(OpenSSL::Digest) then
+    if defined?(OpenSSL::Digest::SHA1) then
       OpenSSL::Digest::SHA1
     end
 
@@ -356,7 +356,7 @@ module Gem::Security https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/rubygems/security.rb#L356
   # Algorithm for creating the key pair used to sign gems
 
   KEY_ALGORITHM =
-    if defined?(OpenSSL::PKey) then
+    if defined?(OpenSSL::PKey::RSA) then
       OpenSSL::PKey::RSA
     end
 

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53419


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