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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54491 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 65cb348c85..b93af3978d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr  6 00:33:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* compile.c (compile_massign_lhs): when index ends with splat,
diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb
index d44ebec9f5..941462d7bd 100644
--- a/lib/rubygems/security.rb
+++ b/lib/rubygems/security.rb
@@ -340,7 +340,7 @@ module Gem::Security
   # 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
   # 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
 
diff --git a/version.h b/version.h
index 3dd4b41149..5f435d4a2b 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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"