ruby-changes:5342
From: knu <ko1@a...>
Date: Thu, 5 Jun 2008 20:39:47 +0900 (JST)
Subject: [ruby-changes:5342] Ruby:r16843 (ruby_1_8): * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
knu 2008-06-05 20:39:21 +0900 (Thu, 05 Jun 2008)
New Revision: 16843
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/ext/openssl/ossl_ssl.c
branches/ruby_1_8/ext/openssl/ossl_ssl_session.c
branches/ruby_1_8/test/openssl/test_ssl.rb
Log:
* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
Add a null check for ssl; submitted by akira yamada
in [ruby-dev:34950].
* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Define OP_NO_TICKET if
SSL_OP_NO_TICKET is present; submitted by akira yamada
in [ruby-dev:34944].
* test/openssl/test_ssl.rb (OpenSSL#test_server_session): Add a
workaround for the case where OpenSSL is configured with
--enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/test/openssl/test_ssl.rb?r1=16843&r2=16842&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=16843&r2=16842&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/openssl/ossl_ssl.c?r1=16843&r2=16842&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/openssl/ossl_ssl_session.c?r1=16843&r2=16842&diff_format=u
Index: ruby_1_8/ext/openssl/ossl_ssl.c
===================================================================
--- ruby_1_8/ext/openssl/ossl_ssl.c (revision 16842)
+++ ruby_1_8/ext/openssl/ossl_ssl.c (revision 16843)
@@ -1466,6 +1466,9 @@
ossl_ssl_def_const(OP_NO_SSLv2);
ossl_ssl_def_const(OP_NO_SSLv3);
ossl_ssl_def_const(OP_NO_TLSv1);
+#if defined(SSL_OP_NO_TICKET)
+ ossl_ssl_def_const(OP_NO_TICKET);
+#endif
ossl_ssl_def_const(OP_PKCS1_CHECK_1);
ossl_ssl_def_const(OP_PKCS1_CHECK_2);
ossl_ssl_def_const(OP_NETSCAPE_CA_DN_BUG);
Index: ruby_1_8/ext/openssl/ossl_ssl_session.c
===================================================================
--- ruby_1_8/ext/openssl/ossl_ssl_session.c (revision 16842)
+++ ruby_1_8/ext/openssl/ossl_ssl_session.c (revision 16843)
@@ -47,7 +47,7 @@
Data_Get_Struct(arg1, SSL, ssl);
- if ((ctx = SSL_get1_session(ssl)) == NULL)
+ if (!ssl || (ctx = SSL_get1_session(ssl)) == NULL)
ossl_raise(eSSLSession, "no session available");
} else {
BIO *in = ossl_obj2bio(arg1);
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 16842)
+++ ruby_1_8/ChangeLog (revision 16843)
@@ -1,3 +1,17 @@
+Thu Jun 5 20:30:46 2008 Akinori MUSHA <knu@i...>
+
+ * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
+ Add a null check for ssl; submitted by akira yamada
+ in [ruby-dev:34950].
+
+ * ext/openssl/ossl_ssl.c (Init_ossl_ssl): Define OP_NO_TICKET if
+ SSL_OP_NO_TICKET is present; submitted by akira yamada
+ in [ruby-dev:34944].
+
+ * test/openssl/test_ssl.rb (OpenSSL#test_server_session): Add a
+ workaround for the case where OpenSSL is configured with
+ --enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
+
Thu Jun 5 11:01:08 2008 Nobuyoshi Nakada <nobu@r...>
* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
Index: ruby_1_8/test/openssl/test_ssl.rb
===================================================================
--- ruby_1_8/test/openssl/test_ssl.rb (revision 16842)
+++ ruby_1_8/test/openssl/test_ssl.rb (revision 16843)
@@ -499,7 +499,12 @@
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :ctx_proc => ctx_proc, :server_proc => server_proc) do |server, port|
10.times do |i|
sock = TCPSocket.new("127.0.0.1", port)
- ssl = OpenSSL::SSL::SSLSocket.new(sock)
+ ctx = OpenSSL::SSL::SSLContext.new
+ if defined?(OpenSSL::SSL::OP_NO_TICKET)
+ # disable RFC4507 support
+ ctx.options = OpenSSL::SSL::OP_NO_TICKET
+ end
+ ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx)
ssl.sync_close = true
ssl.session = first_session if first_session
ssl.connect
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/