diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-29 22:48:25 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-29 22:48:25 +0000 |
| commit | cbb9603f3a70d041a65d98f72f429fb0f70f8877 (patch) | |
| tree | 5eccd42aafa060ba64d7cc6c6f66e9a51fb7be2e | |
| parent | c101436215d4df12f9c63e2a800a37ce16649fb7 (diff) | |
merges r31162 from trunk into ruby_1_9_2.
--
* 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/branches/ruby_1_9_2@31791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/ossl_ocsp.c | 4 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 3 deletions
@@ -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 08:07:33 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * numeric.c (flo_round): fix inaccurate results. diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c index 1c53147a03..7c42839153 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; @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 218 +#define RUBY_PATCHLEVEL 219 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 |