[ruby-cvs:55271] usa:r48121 (ruby_1_9_3): merge revision(s) 45274, 45278, 45280, 48097: [Backport #9424]

usa at ruby-lang.org usa at ruby-lang.org
Fri Oct 24 12:06:39 JST 2014


usa	2014-10-24 12:06:36 +0900 (Fri, 24 Oct 2014)

  New Revision: 48121

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

  Log:
    merge revision(s) 45274,45278,45280,48097: [Backport #9424]
    
    * ext/openssl/lib/openssl/ssl-internal.rb (DEFAULT_PARAMS): override
      options even if OpenSSL::SSL::OP_NO_SSLv3 is not defined.
      this is pointed out by Stephen Touset. [ruby-core:65711] [Bug #9424]
    
    * test/openssl/test_ssl.rb: Reuse TLS default options from
      OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.
    
    * lib/openssl/ssl-internal.rb: Explicitly whitelist the default
      SSL/TLS ciphers. Forbid SSLv2 and SSLv3, disable
      compression by default.
      Reported by Jeff Hodges.
      [ruby-core:59829] [Bug #9424]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/openssl/lib/openssl/ssl-internal.rb
    branches/ruby_1_9_3/test/openssl/test_ssl.rb
    branches/ruby_1_9_3/version.h


More information about the ruby-cvs mailing list