diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-03 12:24:02 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-03 12:24:02 +0000 |
commit | 8a571111295f8ce1720e10fd2760197951d481c7 (patch) | |
tree | 028a3600061dee4f80a65c1bdd2b5d3f4fd1f095 | |
parent | 970ce1fd0987f4a4943f38a32a010f01940d78d6 (diff) |
merges r31528 from trunk into ruby_1_9_2. fixes #4861.
--
* 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/branches/ruby_1_9_2@32382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/openssl/ossl_ssl.c | 3 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 1 deletions
@@ -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. + Mon Jun 13 18:33:04 2011 Tanaka Akira <akr@fsij.org> * lib/securerandom.rb (SecureRandom.random_bytes): modify PRNG state diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index e8d2e864c2..23bfdf3b79 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), @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 281 +#define RUBY_PATCHLEVEL 282 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |