From 78e3dfd95bd56ed4f1a81738e9c83899fd7c21b7 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 11 Jun 2010 14:06:23 +0000 Subject: * ext/openssl/ossl_ssl.c (ossl_sslctx_get_ciphers): use sk_SSL_CIPHER_num and sk_SSL_CIPHER_value instead of cast. patched by Takahiro Kambe [ruby-dev:41530] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/openssl/ossl_ssl.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46167d4a76..8c0c8cb9d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Jun 11 23:04:59 2010 NARUSE, Yui + + * ext/openssl/ossl_ssl.c (ossl_sslctx_get_ciphers): + use sk_SSL_CIPHER_num and sk_SSL_CIPHER_value instead of cast. + patched by Takahiro Kambe [ruby-dev:41530] + Fri Jun 11 22:59:31 2010 Tanaka Akira * include/ruby/missing.h (isnan): fix compilation error on OpenBSD. diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 5c958f0ac3..793d5a65fd 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -700,10 +700,10 @@ ossl_sslctx_get_ciphers(VALUE self) if (!ciphers) return rb_ary_new(); - num = sk_num((STACK*)ciphers); + num = sk_SSL_CIPHER_num(ciphers); ary = rb_ary_new2(num); for(i = 0; i < num; i++){ - cipher = (SSL_CIPHER*)sk_value((STACK*)ciphers, i); + cipher = sk_SSL_CIPHER_value(ciphers, i); rb_ary_push(ary, ossl_ssl_cipher_to_ary(cipher)); } return ary; -- cgit v1.2.3