knu	2008-06-05 20:36:55 +0900 (Thu, 05 Jun 2008)

  New Revision: 16842

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ssl.c
    trunk/ext/openssl/ossl_ssl_session.c
    trunk/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/trunk/ext/openssl/ossl_ssl.c?r1=16842&r2=16841&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16842&r2=16841&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/openssl/ossl_ssl_session.c?r1=16842&r2=16841&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/openssl/test_ssl.rb?r1=16842&r2=16841&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16841)
+++ ChangeLog	(revision 16842)
@@ -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 20:24:15 2008  Yusuke Endoh  <mame@t...>
 
 	* thread.c (thread_set_trace_func_m): fix check for proc argument.
@@ -6,7 +20,7 @@
 
 	* lib/rexml/document.rb (REXML::Document:write): leaky modification
 	  trans -> transitive.  [ruby-dev:32040], r13686
-	
+
 	* lib/rexml/text.rb (Text.check): fix check for illigal characher.
 
 Thu Jun  5 14:03:44 2008  Nobuyoshi Nakada  <nobu@r...>
Index: ext/openssl/ossl_ssl.c
===================================================================
--- ext/openssl/ossl_ssl.c	(revision 16841)
+++ ext/openssl/ossl_ssl.c	(revision 16842)
@@ -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: ext/openssl/ossl_ssl_session.c
===================================================================
--- ext/openssl/ossl_ssl_session.c	(revision 16841)
+++ ext/openssl/ossl_ssl_session.c	(revision 16842)
@@ -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: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 16841)
+++ test/openssl/test_ssl.rb	(revision 16842)
@@ -511,7 +511,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/