From a26bababae523f2e50abc0f99bf7e245bfaeb78f Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 19 Apr 2009 13:32:18 +0000 Subject: merges r22916 from trunk into ruby_1_9_1. -- * ext/openssl/ossl_ssl.c (ossl_ssl_def_const): use INT2NUM because OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG doesn't fit into Fixnum. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/openssl/ossl_ssl.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7ffd9a1f89..5dc7ebe9c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 12 22:14:01 2009 Tanaka Akira + + * ext/openssl/ossl_ssl.c (ossl_ssl_def_const): use INT2NUM because + OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG doesn't fit into Fixnum. + Thu Mar 12 05:22:50 2009 Nobuyoshi Nakada * io.c (copy_stream_fallback_body): off_t may be larger than long. diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 64987a41b5..f78833afd9 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -1431,7 +1431,7 @@ Init_ossl_ssl() rb_define_method(cSSLSocket, "session=", ossl_ssl_set_session, 1); rb_define_method(cSSLSocket, "verify_result", ossl_ssl_get_verify_result, 0); -#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2FIX(SSL_##x)) +#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, INT2NUM(SSL_##x)) ossl_ssl_def_const(VERIFY_NONE); ossl_ssl_def_const(VERIFY_PEER); -- cgit v1.2.3