[ruby-cvs:55248] nagachika:r48098 (ruby_2_1): merge revision(s) r45274, r45278, r45280, r48097: [Backport #9424] [Backport #9640]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Wed Oct 22 23:14:54 JST 2014


nagachika	2014-10-22 23:14:52 +0900 (Wed, 22 Oct 2014)

  New Revision: 48098

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

  Log:
    merge revision(s) r45274,r45278,r45280,r48097: [Backport #9424] [Backport #9640]
    
    * lib/openssl/ssl.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]
    
    * test/openssl/test_ssl.rb: Reuse TLS default options from
      OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.
    
    * ext/openssl/lib/openssl/ssl.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]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/openssl/lib/openssl/ssl.rb
    branches/ruby_2_1/test/openssl/test_ssl.rb
    branches/ruby_2_1/version.h


More information about the ruby-cvs mailing list