[#25808] break & retry in block — Shin-ichiro HARA <sinara@...>

原です。

15 messages 2005/03/04

[#25812] Re: [ruby-cvs] ruby/test/ruby, ruby/test/logger, ruby/sample, ruby/misc, ruby/lib/xmlrpc, ruby/lib/wsdl/soap, ruby/lib/rexml, ruby/lib/rdoc/parsers, ruby/lib/rdoc/generators, ruby/lib/irb, ruby/lib, ruby/ext/zlib, ruby/ext/win32ole, ruby/ext/tk, ruby/ext/strscan, ruby/ext/socket, ruby/ext/readline, ruby/ext/pty, ruby/ext/openssl, ruby/ext/iconv, ruby/ext/etc, ruby/ext/dl, ruby/ext/curses, ruby/ext/bigdecimal, ruby/ext/Win32API, ruby: * array.c: replace rb_protect_inspect() and rb_inspecting_p() by — Tanaka Akira <akr@...17n.org>

In article <20050304064753.53859C671F@lithium.ruby-lang.org>,

3 messages 2005/03/06

[#25853] conflict method and local variable — Hidetoshi NAGAI <nagai@...>

永井@知能.九工大です.

56 messages 2005/03/10
[#25854] Re: conflict method and local variable — Yukihiro Matsumoto <matz@...> 2005/03/10

まつもと ゆきひろです

[#25855] Re: conflict method and local variable — Hidetoshi NAGAI <nagai@...> 2005/03/10

永井@知能.九工大です.

[#25856] Re: conflict method and local variable — Yukihiro Matsumoto <matz@...> 2005/03/10

まつもと ゆきひろです

[#25857] Re: conflict method and local variable — Hidetoshi NAGAI <nagai@...> 2005/03/11

永井@知能.九工大です.

[#25858] Re: conflict method and local variable — Yukihiro Matsumoto <matz@...> 2005/03/11

まつもと ゆきひろです

[#25861] Re: conflict method and local variable — Hidetoshi NAGAI <nagai@...> 2005/03/11

永井@知能.九工大です.

[#25863] Re: conflict method and local variable — Yukihiro Matsumoto <matz@...> 2005/03/11

まつもと ゆきひろです

[#25864] Re: conflict method and local variable — Hidetoshi NAGAI <nagai@...> 2005/03/11

永井@知能.九工大です.

[#25865] Re: conflict method and local variable — Yukihiro Matsumoto <matz@...> 2005/03/11

まつもと ゆきひろです

[#25866] Re: conflict method and local variable — Hidetoshi NAGAI <nagai@...> 2005/03/11

永井@知能.九工大です.

[#25869] Re: conflict method and local variable — Shugo Maeda <shugo@...> 2005/03/13

前田です。

[#25875] Re: conflict method and local variable — Yukihiro Matsumoto <matz@...> 2005/03/13

まつもと ゆきひろです

[#25878] Re: conflict method and local variable — Hidetoshi NAGAI <nagai@...> 2005/03/13

永井@知能.九工大です.

[#25882] Re: conflict method and local variable — Yukihiro Matsumoto <matz@...> 2005/03/13

まつもと ゆきひろです

[#25884] Re: conflict method and local variable — Hidetoshi NAGAI <nagai@...> 2005/03/14

永井@知能.九工大です.

[#25885] Re: conflict method and local variable — Yukihiro Matsumoto <matz@...> 2005/03/14

まつもと ゆきひろです

[#25888] Re: conflict method and local variable — Shugo Maeda <shugo@...> 2005/03/14

前田です。

[#25946] ext/tk/sample/**/*.gif are broken — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

山本です。

16 messages 2005/03/27

[#25959] some trouble on ext/tk/sample — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp>

山本です。

20 messages 2005/03/29
[#25969] Re: some trouble on ext/tk/sample — Hidetoshi NAGAI <nagai@...> 2005/03/30

永井@知能.九工大です.

[#25970] Re: some trouble on ext/tk/sample — "H.Yamamoto" <ocean@...2.ccsnet.ne.jp> 2005/03/30

山本です。

[#25973] Re: some trouble on ext/tk/sample — Hidetoshi NAGAI <nagai@...> 2005/03/31

永井@知能.九工大です.

[ruby-dev:25867] ext/openssl/ossl_{pkey_dh,ssl}.c

From: IWATSUKI Hiroyuki <don@...>
Date: 2005-03-12 11:46:40 UTC
List: ruby-dev #25867
岩月と申します。

Ruby 1.9のmakeでエラーが出ましたので、添付ファイルにありますように修正し
ました。コードの内容を理解しないままとりあえずコンパイルできるようにした
だけですので、ご確認をよろしくお願いいたします。

-- 
Hiroyuki Iwatsuki <URL:mailto:don@na.rim.or.jp>


Attachments (1)

20050312-ruby19_diff (1.73 KB, text/x-diff)
Index: ext/openssl/ossl_pkey_dh.c
===================================================================
RCS file: /home/don/ruby/cvs/src/ruby/ext/openssl/ossl_pkey_dh.c,v
retrieving revision 1.7
diff -u -p -r1.7 ossl_pkey_dh.c
--- ext/openssl/ossl_pkey_dh.c	9 Mar 2005 10:45:41 -0000	1.7
+++ ext/openssl/ossl_pkey_dh.c	11 Mar 2005 22:54:25 -0000
@@ -401,12 +401,12 @@ ossl_create_dh(unsigned char *p, size_t 
 {
     DH *dh;
 
-    if ((dh = DH_new()) == NULL) ossl_irase(eDHError, NULL);
+    if ((dh = DH_new()) == NULL) ossl_raise(eDHError, NULL);
     dh->p = BN_bin2bn(p, plen, NULL);
     dh->g = BN_bin2bn(g, glen, NULL);
     if (dh->p == NULL || dh->g == NULL){
         DH_free(dh);
-	ossl_irase(eDHError, NULL);
+	ossl_raise(eDHError, NULL);
     }
 
     return dh;
Index: ext/openssl/ossl_ssl.c
===================================================================
RCS file: /home/don/ruby/cvs/src/ruby/ext/openssl/ossl_ssl.c,v
retrieving revision 1.23
diff -u -p -r1.23 ossl_ssl.c
--- ext/openssl/ossl_ssl.c	9 Mar 2005 10:45:41 -0000	1.23
+++ ext/openssl/ossl_ssl.c	11 Mar 2005 22:56:47 -0000
@@ -223,7 +223,7 @@ ossl_call_tmp_dh_callback(VALUE *args)
     dh = rb_funcall(cb, rb_intern("call"), 3, args[0], args[1], args[2]);
     pkey = GetPKeyPtr(dh);
     if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) return Qfalse;
-    ossl_ssl_set_tmp_dh_key(args[0], dh);
+    ossl_ssl_set_tmp_dh(args[0], dh);
 
     return Qtrue;
 }
@@ -241,7 +241,7 @@ ossl_tmp_dh_callback(SSL *ssl, int is_ex
                          (VALUE)args, &status);
     if (status || !success) return NULL;
 
-    return GetPKeyPtr(ossl_ssl_get_dh(obj))->pkey.dh;
+    return GetPKeyPtr(ossl_ssl_get_tmp_dh(obj))->pkey.dh;
 }
 
 static DH*

In This Thread

Prev Next