summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-24 01:25:17 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-24 01:25:17 +0000
commitfea562417fa8589365aeb9b994ff36d952305f1a (patch)
tree816c9ec751bb62cdedaaafad370f4d83e52d89e3
parent72f79b9da468a90218e48863a7d1146175b2e070 (diff)
* ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify): flags is VALUE,
so it should use NUM2INT. * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/openssl/ossl_ocsp.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 03866621fc..d3e6646b00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Mar 24 09:56:19 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify): flags is VALUE,
+ so it should use NUM2INT.
+
+ * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): ditto.
+
Wed Mar 23 21:09:29 2011 Tanaka Akira <akr@fsij.org>
* ext/readline/readline.c: parenthesize macro arguments.
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index dc4d4fb2af..aad669db30 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -245,7 +245,7 @@ ossl_ocspreq_verify(int argc, VALUE *argv, VALUE self)
rb_scan_args(argc, argv, "21", &certs, &store, &flags);
x509st = GetX509StorePtr(store);
- flg = NIL_P(flags) ? 0 : INT2NUM(flags);
+ flg = NIL_P(flags) ? 0 : NUM2INT(flags);
x509s = ossl_x509_ary2sk(certs);
GetOCSPReq(self, req);
result = OCSP_request_verify(req, x509s, x509st, flg);
@@ -601,7 +601,7 @@ ossl_ocspbres_verify(int argc, VALUE *argv, VALUE self)
rb_scan_args(argc, argv, "21", &certs, &store, &flags);
x509st = GetX509StorePtr(store);
- flg = NIL_P(flags) ? 0 : INT2NUM(flags);
+ flg = NIL_P(flags) ? 0 : NUM2INT(flags);
x509s = ossl_x509_ary2sk(certs);
GetOCSPBasicRes(self, bs);
result = OCSP_basic_verify(bs, x509s, x509st, flg) > 0 ? Qtrue : Qfalse;