nahi	2011-12-20 15:06:46 +0900 (Tue, 20 Dec 2011)

  New Revision: 34078

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

  Log:
    * Make sure to clear $! when ignoring an exception
    
    * ext/openssl/ossl.c (ossl_pem_passwd_cb0, ossl_verify_cb): 
      pem_passwd_cb and verify_cb ignores the exception raised in a 
      callback proc so it should clear $! for subsequent execution. 
    
      That's said, both subsequent processes for pem_passwd_cb and 
      verify_cb raises another exception before leaking $! to Ruby world.
      We cannot test this fix in Ruby land.
    
    * test/openssl/test_pkey_rsa.rb
      (test_read_private_key_pem_pw_exception): Test for pem_passwd_cb + 
      exception.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl.c
    trunk/test/openssl/test_pkey_rsa.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34077)
+++ ChangeLog	(revision 34078)
@@ -1,3 +1,19 @@
+Tue Dec 20 15:04:18 2011  Hiroshi Nakamura  <nahi@r...>
+
+	* Make sure to clear $! when ignoring an exception
+
+	* ext/openssl/ossl.c (ossl_pem_passwd_cb0, ossl_verify_cb):
+	  pem_passwd_cb and verify_cb ignores the exception raised in a
+	  callback proc so it should clear $! for subsequent execution.
+
+	  That's said, both subsequent processes for pem_passwd_cb and
+	  verify_cb raises another exception before leaking $! to Ruby world.
+	  We cannot test this fix in Ruby land.
+
+	* test/openssl/test_pkey_rsa.rb
+	  (test_read_private_key_pem_pw_exception): Test for pem_passwd_cb +
+	  exception.
+
 Tue Dec 20 11:49:13 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/date/test_date_base.rb (test_jd): tests for
Index: ext/openssl/ossl.c
===================================================================
--- ext/openssl/ossl.c	(revision 34077)
+++ ext/openssl/ossl.c	(revision 34078)
@@ -175,7 +175,11 @@
 	 */
 	rflag = flag ? Qtrue : Qfalse;
 	pass  = rb_protect(ossl_pem_passwd_cb0, rflag, &status);
-	if (status) return -1; /* exception was raised. */
+	if (status) {
+	    /* ignore an exception raised. */
+	    rb_set_errinfo(Qnil);
+	    return -1;
+	}
 	len = RSTRING_LENINT(pass);
 	if (len < 4) { /* 4 is OpenSSL hardcoded limit */
 	    rb_warning("password must be longer than 4 bytes");
@@ -216,18 +220,23 @@
     if ((void*)proc == 0)
 	return ok;
     if (!NIL_P(proc)) {
+	ret = Qfalse;
 	rctx = rb_protect((VALUE(*)(VALUE))ossl_x509stctx_new,
 			  (VALUE)ctx, &state);
-	ret = Qfalse;
-	if (!state) {
+	if (state) {
+	    rb_set_errinfo(Qnil);
+	    rb_warn("StoreContext initialization failure");
+	}
+	else {
 	    args.proc = proc;
 	    args.preverify_ok = ok ? Qtrue : Qfalse;
 	    args.store_ctx = rctx;
 	    ret = rb_protect((VALUE(*)(VALUE))ossl_call_verify_cb_proc, (VALUE)&args, &state);
-	    ossl_x509stctx_clear_ptr(rctx);
 	    if (state) {
+		rb_set_errinfo(Qnil);
 		rb_warn("exception in verify_callback is ignored");
 	    }
+	    ossl_x509stctx_clear_ptr(rctx);
 	}
 	if (ret == Qtrue) {
 	    X509_STORE_CTX_set_error(ctx, X509_V_OK);
Index: test/openssl/test_pkey_rsa.rb
===================================================================
--- test/openssl/test_pkey_rsa.rb	(revision 34077)
+++ test/openssl/test_pkey_rsa.rb	(revision 34078)
@@ -233,6 +233,17 @@
     assert_equal([], OpenSSL.errors)
   end
 
+  def test_read_private_key_pem_pw_exception
+    pem = OpenSSL::TestUtils::TEST_KEY_RSA1024.to_pem(OpenSSL::Cipher.new('AES-128-CBC'), 'secret')
+    # it raises an ArgumentError from PEM reading. The exception raised inside are ignored for now.
+    assert_raise(ArgumentError) do
+      OpenSSL::PKey.read(pem) do
+        raise RuntimeError
+      end
+    end
+    assert_equal([], OpenSSL.errors)
+  end
+
   private
 
   def check_PUBKEY(asn1, key)

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