diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-11 14:06:23 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-11 14:06:23 +0000 |
| commit | 78e3dfd95bd56ed4f1a81738e9c83899fd7c21b7 (patch) | |
| tree | 4d8ab978e5b889583eebaf8c46a0925ceda24f2d | |
| parent | b04fa7b8e1877c871f0db8f4e6753712deeb6a29 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Jun 11 23:04:59 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * 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 <akr@fsij.org> * 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; |