nagachika	2015-11-01 03:55:07 +0900 (Sun, 01 Nov 2015)

  New Revision: 52414

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

  Log:
    merge revision(s) 51569,51649: [Backport #11366] [Backport #11367]
    
    test_ssl_session.rb: check SSL method
    
    * test/openssl/test_ssl_session.rb (test_ctx_server_session_cb):
      ensure the method to be tested is supported.
    * test/openssl/test_ssl_session.rb: Fix tests so that they take in to
      account OpenSSL installations that have SSLv3 disabled by default.
      Thanks Jeremy Evans <code@j...> for the patches.
      [Bug #11366] [Bug #11367]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/openssl/test_ssl_session.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52413)
+++ ruby_2_2/ChangeLog	(revision 52414)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sun Nov  1 03:52:41 2015  Aaron Patterson <tenderlove@r...>
+
+	* test/openssl/test_ssl_session.rb: Fix tests so that they take in to
+	  account OpenSSL installations that have SSLv3 disabled by default.
+	  Thanks Jeremy Evans <code@j...> for the patches.
+	  [Bug #11366] [Bug #11367]
+
 Sun Nov  1 03:40:43 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52413)
+++ ruby_2_2/version.h	(revision 52414)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
 #define RUBY_RELEASE_DATE "2015-11-01"
-#define RUBY_PATCHLEVEL 184
+#define RUBY_PATCHLEVEL 185
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11
Index: ruby_2_2/test/openssl/test_ssl_session.rb
===================================================================
--- ruby_2_2/test/openssl/test_ssl_session.rb	(revision 52413)
+++ ruby_2_2/test/openssl/test_ssl_session.rb	(revision 52414)
@@ -316,6 +316,7 @@ __EOS__ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/openssl/test_ssl_session.rb#L316
 
     ctx_proc = Proc.new { |ctx, ssl|
       ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_SERVER
+      ctx.options = OpenSSL::SSL::OP_NO_TICKET
       last_server_session = nil
 
       # get_cb is called whenever a client proposed to resume a session but
@@ -355,7 +356,7 @@ __EOS__ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/openssl/test_ssl_session.rb#L356
       3.times do
         sock = TCPSocket.new("127.0.0.1", port)
         begin
-          ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new("SSLv3"))
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, OpenSSL::SSL::SSLContext.new())
           ssl.sync_close = true
           ssl.session = last_client_session if last_client_session
           ssl.connect

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r51569,51649


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