[前][次][番号順一覧][スレッド一覧]

ruby-changes:16310

From: naruse <ko1@a...>
Date: Fri, 11 Jun 2010 23:06:39 +0900 (JST)
Subject: [ruby-changes:16310] Ruby:r28282 (trunk): * ext/openssl/ossl_ssl.c (ossl_sslctx_get_ciphers):

naruse	2010-06-11 23:06:23 +0900 (Fri, 11 Jun 2010)

  New Revision: 28282

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28282

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28281)
+++ ChangeLog	(revision 28282)
@@ -1,3 +1,9 @@
+Fri Jun 11 23:04:59 2010  NARUSE, Yui  <naruse@r...>
+
+	* 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@f...>
 
 	* include/ruby/missing.h (isnan): fix compilation error on OpenBSD.
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 28281)
+++ ext/openssl/ossl_ssl.c	(revision 28282)
@@ -700,10 +700,10 @@
     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;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]