diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-31 04:45:44 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-31 04:45:44 +0000 |
| commit | 4cf6bcf78d8693078c8f4b2ff47b9e81fbc310c5 (patch) | |
| tree | b6c33c76e24a03668c3ef6a91dd1e9eab1f92354 | |
| parent | 337f8efb6319479f577bc6fce0dfa16f7ad164c0 (diff) | |
* ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): fix for
initialization of r18168.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/ossl_ocsp.c | 7 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun Aug 31 13:45:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): fix for + initialization of r18168. + Sat Aug 30 14:59:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): fix for diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c index 36a3dd7049..07a97d82c9 100644 --- a/ext/openssl/ossl_ocsp.c +++ b/ext/openssl/ossl_ocsp.c @@ -316,12 +316,13 @@ ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self) rb_scan_args(argc, argv, "01", &arg); if(!NIL_P(arg)){ - OCSP_RESPONSE *res = DATA_PTR(self); + OCSP_RESPONSE *res = DATA_PTR(self), *x; arg = ossl_to_der_if_possible(arg); StringValue(arg); p = (unsigned char *)RSTRING_PTR(arg); - if(!d2i_OCSP_RESPONSE(&res, &p, RSTRING_LEN(arg)) && - (DATA_PTR(self) = res, 1)){ + x = d2i_OCSP_RESPONSE(&res, &p, RSTRING_LEN(arg)); + DATA_PTR(self) = res; + if(!x){ ossl_raise(eOCSPError, "cannot load DER encoded response"); } } |