ruby.git/ext/openssl/lib, branch ruby_1_9_3

merge revision(s) 45274,45278,45280,48097: [Backport #9424]

2014-10-24T03:06:36+00:00

	* 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]



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

merge revision(s) 41805: [Backport #8575]

2013-07-17T01:19:39+00:00

	* lib/openssl/ssl.rb: Fix SSL client connection crash for SAN marked
	  critical.
	  The patch for CVE-2013-4073 caused SSL crash when a SSL server returns
	  the certificate that has critical SAN value.  X509 extension could
	  include 2 or 3 elements in it:
	  [id, criticality, octet_string] if critical,
	  [id, octet_string] if not.
	  Making sure to pick the last element of X509 extension and use it as
	  SAN value.
	  [ruby-core:55685] [Bug #8575]
	  Thank you @nahi for providing the patch!


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

merge revision(s) 41671:

2013-06-27T11:13:08+00:00

* ext/openssl/lib/openssl/ssl-inernal.rb (verify_certificate_identity):
  fix hostname verification. Patched by nahi.

* test/openssl/test_ssl.rb (test_verify_certificate_identity): test for
  above.


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

Commit miss, revert previous commit.

2013-06-25T12:53:05+00:00

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

merge revision(s) 41325: [Backport #8554]

2013-06-25T12:40:50+00:00

* gc.c: Fixup around GC by MALLOC.
  Add allocate size to malloc_increase before GC
  for updating limit in after_gc_sweep.
  Reset malloc_increase into garbage_collect()
  for preventing GC again soon.
  this backport patch is written by nari.


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

merge revision(s) 33485:

2012-02-10T17:27:22+00:00

	* lib/openssl/buffering.rb: Force multi-byte strings to be treated as
	  binary data.

	* test/openssl/test_ssl.rb: Add test for it.
	Thanks to Niklas Baumstark for reporting the issue!
	[Ruby 1.9 - Bug #5233] [ruby-core:39120]


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

* backport r33066 from trunk.

2011-08-25T00:52:10+00:00

* ext/openssl/lib/openssl/bn.rb:  Hide copyright info from RDoc.
* ext/openssl/lib/openssl/digest.rb:  ditto
* ext/openssl/lib/openssl/cipher.rb:  ditto

* backport r33065 from trunk.

* ext/openssl/ossl_digest.c:  Document OpenSSL::Digest::digest and add
  an example to OpenSSL::Digest.  Patch by Sylvain Daubert.
  [Ruby 1.9 - Bug #5166]
* ext/openssl/lib/openssl/digest.rb (module OpenSSL):  ditto


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

* ext/openssl/lib/openssl/{x509.rb,ssl.rb}: Add deprecation warning

2011-07-25T06:38:44+00:00

  for openssl/{x509,ssl} usage. Users should require "openssl" instead 
  of "openssl/ssl" and "openssl/x509". Start of transition period 
  introduced by [ruby-dev:38018].


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

* backport r32662 from trunk.

2011-07-25T04:51:26+00:00

* ext/openssl/lib/openssl/x509.rb: Cosmetic change: move definition
  introduced in r30152 to x509-internal.rb.


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

* ext/openssl/ossl_cipher.c, ext/openssl/lib/openssl/cipher.rb:

2011-06-20T09:48:05+00:00

  Documentation fix by Ippei Obayashi. See #4419.


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