diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-30 15:51:02 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-30 15:51:02 +0000 |
| commit | b8231227773bab5e133ac9be7c23378c64011561 (patch) | |
| tree | 3b81486eaa840fe0623b5d1b4fea26ec02e0f3e8 | |
| parent | 6136b992d4d4df727fcdb50ef07194a50bac9bd9 (diff) | |
merge revision(s) r44402: [Backport #9460]
* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant
`OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined. The
`SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest
snapshot of OpenSSL 1.0.1. [Fixes GH-488]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 2 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Fri Jan 31 00:49:41 2014 Yamashita Yuu <yamashita@geishatokyo.com> + + * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant + `OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined. The + `SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest + snapshot of OpenSSL 1.0.1. [Fixes GH-488] + Thu Jan 23 21:08:16 2014 Shota Fukumori <her@sorah.jp> * vm_insnhelper.c (check_match): Fix SEGV with VM_CHECKMATCH_TYPE_CASE diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 62a37b6c5b..8cc979895a 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -2191,7 +2191,9 @@ Init_ossl_ssl() ossl_ssl_def_const(OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG); ossl_ssl_def_const(OP_SSLREF2_REUSE_CERT_TYPE_BUG); ossl_ssl_def_const(OP_MICROSOFT_BIG_SSLV3_BUFFER); +#if defined(SSL_OP_MSIE_SSLV2_RSA_PADDING) ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING); +#endif ossl_ssl_def_const(OP_SSLEAY_080_CLIENT_DH_BUG); ossl_ssl_def_const(OP_TLS_D5_BUG); ossl_ssl_def_const(OP_TLS_BLOCK_PADDING_BUG); @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-01-23" -#define RUBY_PATCHLEVEL 389 +#define RUBY_RELEASE_DATE "2014-01-31" +#define RUBY_PATCHLEVEL 390 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" |