shugo	2009-02-26 14:32:02 +0900 (Thu, 26 Feb 2009)

  New Revision: 22646

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

  Log:
    * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify
      returns positive value on success, not non-zero.  [ruby-core:21762]
      backported r22440 from trunk.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/openssl/ossl_ocsp.c

Index: ruby_1_8/ext/openssl/ossl_ocsp.c
===================================================================
--- ruby_1_8/ext/openssl/ossl_ocsp.c	(revision 22645)
+++ ruby_1_8/ext/openssl/ossl_ocsp.c	(revision 22646)
@@ -593,22 +593,22 @@
 static VALUE
 ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self)
 {
-    VALUE certs, store, flags;
+    VALUE certs, store, flags, result;
     OCSP_BASICRESP *bs;
     STACK_OF(X509) *x509s;
     X509_STORE *x509st;
-    int flg, result;
+    int flg;
 
     rb_scan_args(argc, argv, "21", &certs, &store, &flags);
     x509st = GetX509StorePtr(store);
     flg = NIL_P(flags) ? 0 : INT2NUM(flags);
     x509s = ossl_x509_ary2sk(certs);
     GetOCSPBasicRes(self, bs);
-    result = OCSP_basic_verify(bs, x509s, x509st, flg);
+    result = OCSP_basic_verify(bs, x509s, x509st, flg) > 0 ? Qtrue : Qfalse;
     sk_X509_pop_free(x509s, X509_free);
     if(!result) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
 
-    return result ? Qtrue : Qfalse;
+    return result;
 }
 
 /*
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 22645)
+++ ruby_1_8/ChangeLog	(revision 22646)
@@ -1,3 +1,9 @@
+Thu Feb 26 14:31:27 2009  Shugo Maeda  <shugo@r...>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify
+	  returns positive value on success, not non-zero.  [ruby-core:21762]
+	  backported r22440 from trunk.
+
 Thu Feb 26 12:36:36 2009  Akinori MUSHA  <knu@i...>
 
 	* lib/generator.rb: Remove next() before overriding it to avoid a

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