shyouhei	2009-03-09 20:59:27 +0900 (Mon, 09 Mar 2009)

  New Revision: 22857

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

  Log:
    merge revision(s) 22646:
    * 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_7/ChangeLog
    branches/ruby_1_8_7/ext/openssl/ossl_ocsp.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/openssl/ossl_ocsp.c
===================================================================
--- ruby_1_8_7/ext/openssl/ossl_ocsp.c	(revision 22856)
+++ ruby_1_8_7/ext/openssl/ossl_ocsp.c	(revision 22857)
@@ -589,22 +589,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_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22856)
+++ ruby_1_8_7/ChangeLog	(revision 22857)
@@ -1,3 +1,9 @@
+Mon Mar  9 20:59:24 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.
+
 Mon Mar  9 10:02:15 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* re.c (match_check): check if MatchData is initialized.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22856)
+++ ruby_1_8_7/version.h	(revision 22857)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-03-09"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090309
-#define RUBY_PATCHLEVEL 149
+#define RUBY_PATCHLEVEL 150
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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