* ext/openssl/ossl_ssl.c: Merge ruby/openssl@81e1a30

* test/openssl/test_ssl.rb: ditto


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

ChangeLog

@@ -1,3 +1,9 @@
+Fri Nov 13 13:09:16 2015  Zachary Scott  <zzak@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* prelude.rb (Thread.exclusive): warn as deprecated.

ext/openssl/ossl_ssl.c

@@ -2107,6 +2107,12 @@ Init_ossl_ssl(void)
     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.

test/openssl/test_ssl.rb

@@ -415,7 +415,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
         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