zzak	2015-11-13 13:10:58 +0900 (Fri, 13 Nov 2015)

  New Revision: 52555

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

  Log:
    * ext/openssl/ossl_ssl.c: Merge ruby/openssl@81e1a30
    * test/openssl/test_ssl.rb: ditto

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c
    trunk/test/openssl/test_ssl.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52554)
+++ ChangeLog	(revision 52555)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Nov 13 13:09:16 2015  Zachary Scott  <zzak@r...>
+
+	* ext/openssl/ossl_ssl.c: Merge ruby/openssl@81e1a30
+
+	* test/openssl/test_ssl.rb: ditto
+
 Fri Nov 13 13:05:37 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* prelude.rb (Thread.exclusive): warn as deprecated.
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 52554)
+++ ext/openssl/ossl_ssl.c	(revision 52555)
@@ -2107,6 +2107,12 @@ Init_ossl_ssl(void) https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl_ssl.c#L2107
     rb_define_const(mSSLExtConfig, "HAVE_TLSEXT_HOST_NAME", Qfalse);
 #endif
 
+#ifdef TLS_DH_anon_WITH_AES_256_GCM_SHA384
+    rb_define_const(mSSLExtConfig, "TLS_DH_anon_WITH_AES_256_GCM_SHA384", Qtrue);
+#else
+    rb_define_const(mSSLExtConfig, "TLS_DH_anon_WITH_AES_256_GCM_SHA384", Qfalse);
+#endif
+
     /*
      * A callback invoked whenever a new handshake is initiated. May be used
      * to disable renegotiation entirely.
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 52554)
+++ test/openssl/test_ssl.rb	(revision 52555)
@@ -415,7 +415,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTes https://github.com/ruby/ruby/blob/trunk/test/openssl/test_ssl.rb#L415
         assert_raise_with_message(sslerr,msg){ssl.post_connection_check("localhost.localdomain")}
       }
     }
-  end
+  end if OpenSSL::ExtConfig::TLS_DH_anon_WITH_AES_256_GCM_SHA384
 
   def test_post_connection_check
     sslerr = OpenSSL::SSL::SSLError

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/