yugui	2010-12-08 17:09:36 +0900 (Wed, 08 Dec 2010)

  New Revision: 30138

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

  Log:
    merges r29784,r29787 and r29788 from trunk into ruby_1_9_2.
    --
    * etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
      pointer is invalid.  Thanks Ippei Obayashi! [ruby-dev:42573]
    --
    STDIN is not valid when ruby doesn't have tty.
    --
    making ssl test a little better

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/openssl/ossl_ssl.c
    branches/ruby_1_9_2/test/openssl/test_ssl.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30137)
+++ ruby_1_9_2/ChangeLog	(revision 30138)
@@ -1,3 +1,8 @@
+Mon Nov 15 06:43:48 2010  Aaron Patterson <aaron@t...>
+
+	* etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
+	  pointer is invalid.  Thanks Ippei Obayashi! [ruby-dev:42573]
+
 Mon Dec  6 22:53:49 2010  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* cygwin/GNUMakefile.in ($(RCFILES)): fixes [ruby-core:33525].
Index: ruby_1_9_2/ext/openssl/ossl_ssl.c
===================================================================
--- ruby_1_9_2/ext/openssl/ossl_ssl.c	(revision 30137)
+++ ruby_1_9_2/ext/openssl/ossl_ssl.c	(revision 30138)
@@ -1337,7 +1337,7 @@
     X509 *cert = NULL;
 
     Data_Get_Struct(self, SSL, ssl);
-    if (ssl) {
+    if (!ssl) {
         rb_warning("SSL session is not started yet.");
         return Qnil;
     }
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30137)
+++ ruby_1_9_2/version.h	(revision 30138)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 91
+#define RUBY_PATCHLEVEL 92
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/openssl/test_ssl.rb
===================================================================
--- ruby_1_9_2/test/openssl/test_ssl.rb	(revision 30137)
+++ ruby_1_9_2/test/openssl/test_ssl.rb	(revision 30138)
@@ -160,6 +160,12 @@
     assert_equal(ctx.setup, nil)
   end
 
+  def test_not_started_session
+    open(__FILE__) do |f|
+      assert_nil OpenSSL::SSL::SSLSocket.new(f).cert
+    end
+  end
+
   def test_ssl_read_nonblock
     start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true) { |server, port|
       sock = TCPSocket.new("127.0.0.1", port)

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