summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriwamatsu <iwamatsu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-12 04:22:16 +0000
committeriwamatsu <iwamatsu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-12 04:22:16 +0000
commitbaf2eff25e55bac63b4737865572fe2cb8f4d1af (patch)
tree3a78e50bac7ff51f72a7dcf527e6076f2218e42e
parent6eaa5cb30cee1d1ef934429807e26e9bd996d6de (diff)
* ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed.
However, the problem is not revised in this. This adds the control of using function of SSLv2 in made macro by function check. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/openssl/ossl_ssl.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0fdac166258..125333d7283 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 12 12:24:22 2011 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+
+ * ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is executed.
+ However, the problem is not revised in this.
+ This adds the control of using function of SSLv2 in made macro by function check.
+
Thu May 12 08:10:46 2011 Eric Hodel <drbrain@segment7.net>
* lib/set.rb (class Set): Add nodoc to internal-use methods. Patch
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index d8951fbde5c..d750e95ca3e 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -107,9 +107,12 @@ struct {
OSSL_SSL_METHOD_ENTRY(TLSv1),
OSSL_SSL_METHOD_ENTRY(TLSv1_server),
OSSL_SSL_METHOD_ENTRY(TLSv1_client),
+#if defined(HAVE_SSLV2_METHOD) && defined(HAVE_SSLV2_SERVER_METHOD) && \
+ defined(HAVE_SSLV2_CLIENT_METHOD)
OSSL_SSL_METHOD_ENTRY(SSLv2),
OSSL_SSL_METHOD_ENTRY(SSLv2_server),
OSSL_SSL_METHOD_ENTRY(SSLv2_client),
+#endif
OSSL_SSL_METHOD_ENTRY(SSLv3),
OSSL_SSL_METHOD_ENTRY(SSLv3_server),
OSSL_SSL_METHOD_ENTRY(SSLv3_client),