kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 51569,51649: [Backport #11367]

Browse source 
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@jeremyevans.net> for the patches.
	  [Bug #11366] [Bug #11367]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-11-18 11:13:07 +00:00
parent 7e9ce9f5d6
commit 69e671aa96
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Nov 18 20:10:31 2015 Aaron Patterson <tenderlove@ruby-lang.org>
* 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@jeremyevans.net> for the patches.
[Bug #11366] [Bug #11367]
Wed Nov 18 20:04:50 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):

3
test/openssl/test_ssl_session.rb
View file

@ -307,6 +307,7 @@ __EOS__
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
@ -345,7 +346,7 @@ __EOS__
last_client_session = nil
3.times do
sock = TCPSocket.new("127.0.0.1", port)
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

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.8"
#define RUBY_RELEASE_DATE "2015-11-18"
#define RUBY_PATCHLEVEL 413
#define RUBY_PATCHLEVEL 414
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 11