1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
ruby--ruby/ext/openssl
usa 289889a654 merge revision(s) 54258: [Backport #12182]
* ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
	  function rather than OPENSSL_NPN_NEGOTIATED macro. it exists
	  even if it is disabled by OpenSSL configuration.
	  [ruby-core:74384] [Bug #12182]

	* ext/openssl/ossl_ssl.c: update #ifdef(s) as above.

	* test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-29 12:17:03 +00:00
..
lib merge revision(s) 46108,46209,46223,46297,48223,48224: [Backport #12168] 2016-03-25 09:06:16 +00:00
depend openssl: work around of dependency 2013-10-28 06:32:24 +00:00
deprecation.rb * ext/openssl/deprecation.rb (OpenSSL.check_func): check if header is 2012-05-01 05:18:02 +00:00
extconf.rb merge revision(s) 54258: [Backport #12182] 2016-03-29 12:17:03 +00:00
openssl_missing.c * file.c, ext/etc/etc.c, ext/socket/unixsocket.c, 2013-05-09 12:12:17 +00:00
openssl_missing.h * ext/openssl/extconf.rb 2011-06-26 01:32:03 +00:00
ossl.c merge revision(s) r45540: [Backport #9911] 2014-06-23 16:03:42 +00:00
ossl.h merge revision(s) 44579: [Backport #9500] 2014-02-10 13:35:07 +00:00
ossl_asn1.c merge revision(s) 50646: [Backport #11185] 2015-06-09 07:28:56 +00:00
ossl_asn1.h
ossl_bio.c * include/ruby/intern.h (rb_cloexec_dup): declared. 2011-10-29 11:02:32 +00:00
ossl_bio.h
ossl_bn.c * bignum.c (MSB): Removed. 2013-06-25 03:08:23 +00:00
ossl_bn.h
ossl_cipher.c merge revision(s) r48923: [Backport #10633] 2015-01-22 11:51:16 +00:00
ossl_cipher.h
ossl_config.c * ext/openssl/ossl_config.c: [DOC] Document the following: 2013-11-13 09:34:08 +00:00
ossl_config.h
ossl_digest.c * whitespace cleanup. 2011-11-04 07:19:23 +00:00
ossl_digest.h
ossl_engine.c * ext/openssl/ossl_engine.c: [DOC] Documentation for OpenSSL::Engine 2013-11-21 04:37:14 +00:00
ossl_engine.h
ossl_hmac.c * ext/openssl/ossl_hmac.c: [DOC] Documentation for OpenSSL::HMAC 2013-08-06 23:32:42 +00:00
ossl_hmac.h
ossl_ns_spki.c * ext/openssl/ossl_ns_spki.c: Complete documentation. 2011-10-20 17:22:09 +00:00
ossl_ns_spki.h
ossl_ocsp.c * ext/openssl/*: Document synonymous methods, by windwiny [GH-277] 2013-04-16 02:24:09 +00:00
ossl_ocsp.h
ossl_pkcs5.c * ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): suppress warnings. 2012-04-22 12:43:53 +00:00
ossl_pkcs5.h
ossl_pkcs7.c ruby/ruby.h: RB_BLOCK_CALL_FUNC_ARGLIST 2013-11-29 07:59:14 +00:00
ossl_pkcs7.h
ossl_pkcs12.c * ext/openssl/ossl.h: Introduced OSSL_BIO_reset macro for PEM/DER 2011-06-22 08:41:08 +00:00
ossl_pkcs12.h
ossl_pkey.c merge revision(s) 52556,52557: [Backport #10735] 2015-11-18 11:39:53 +00:00
ossl_pkey.h * whitespace cleanup. 2011-11-04 07:19:23 +00:00
ossl_pkey_dh.c merge revision(s) 44584,44587,44945: [Backport #9243] 2014-02-22 05:56:02 +00:00
ossl_pkey_dsa.c * ext/openssl/*: Document synonymous methods, by windwiny [GH-277] 2013-04-16 02:24:09 +00:00
ossl_pkey_ec.c * ext/openssl/ossl_pkey_ec.c: Ensure compatibility to builds of 2013-07-05 22:46:42 +00:00
ossl_pkey_rsa.c * ext/openssl/*: Document synonymous methods, by windwiny [GH-277] 2013-04-16 02:24:09 +00:00
ossl_rand.c * ext/openssl/ossl.c: surpress warning: shorten-64-to-32. 2011-03-24 07:29:21 +00:00
ossl_rand.h
ossl_ssl.c merge revision(s) 54258: [Backport #12182] 2016-03-29 12:17:03 +00:00
ossl_ssl.h * ext/openssl/ossl_ssl.h: parenthesize macro arguments. 2011-03-10 13:28:58 +00:00
ossl_ssl_session.c * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_time): Check 2011-06-23 10:36:09 +00:00
ossl_version.h
ossl_x509.c
ossl_x509.h
ossl_x509attr.c * ext/openssl/ossl_x509attr.c: change OSSL_X509ATTR_IS_SINGLE and 2013-06-21 07:39:15 +00:00
ossl_x509cert.c * ext/openssl/ossl_x509cert.c: Fix doc typo. 2012-03-31 03:07:53 +00:00
ossl_x509crl.c * ext/openssl/ossl.h: Introduced OSSL_BIO_reset macro for PEM/DER 2011-06-22 08:41:08 +00:00
ossl_x509ext.c * ext/openssl/ossl.c: surpress warning: shorten-64-to-32. 2011-03-24 07:29:21 +00:00
ossl_x509name.c ruby/ruby.h: RB_BLOCK_CALL_FUNC_ARGLIST 2013-11-29 07:59:14 +00:00
ossl_x509req.c * ext/openssl/ossl.h: Introduced OSSL_BIO_reset macro for PEM/DER 2011-06-22 08:41:08 +00:00
ossl_x509revoked.c * ext/openssl/ossl_x509revoked.c: parenthesize macro arguments. 2011-03-19 03:30:59 +00:00
ossl_x509store.c * ext/openssl/*: Document synonymous methods, by windwiny [GH-277] 2013-04-16 02:24:09 +00:00
ruby_missing.h * ext/openssl/extconf.rb: remove checks for available functions. 2011-11-26 01:49:36 +00:00