diff options
| author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-11 10:39:47 +0000 |
|---|---|---|
| committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-11 10:39:47 +0000 |
| commit | 004bd2590b5be59a291f5dd436ca413bb89ed3e9 (patch) | |
| tree | 0788c40f485ac1dd553708dce8972d98254fd1cf | |
| parent | a6567f2b999b0e14c1d18668ecbfab874e407545 (diff) | |
| download | ruby-004bd2590b5be59a291f5dd436ca413bb89ed3e9.tar.gz | |
* ext/openssl/ossl_x509req.c: raise RequestError instead of
CertificateError when Request#to_der gets an error from OpenSSL.
Patch from Ippei Obayashi, see #4420. I cannot write a test for
this... Request does not allow to create broken bytes...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509req.c | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Sat Jun 11 19:27:06 2011 Hiroshi Nakamura <nahi@ruby-lang.org> + + * ext/openssl/ossl_x509req.c: raise RequestError instead of + CertificateError when Request#to_der gets an error from OpenSSL. + Patch from Ippei Obayashi, see #4420. I cannot write a test for + this... Request does not allow to create broken bytes... + Sat Jun 11 19:34:51 2011 Tadayoshi Funaba <tadf@dotrb.org> * ext/date/date_core.c (Date::(ABBR_)?(MONTH|DAY)NAMES): should be usascii. diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c index f68d215da5..ec5b4a34e8 100644 --- a/ext/openssl/ossl_x509req.c +++ b/ext/openssl/ossl_x509req.c @@ -171,7 +171,7 @@ ossl_x509req_to_der(VALUE self) GetX509Req(self, req); if ((len = i2d_X509_REQ(req, NULL)) <= 0) - ossl_raise(eX509CertError, NULL); + ossl_raise(eX509ReqError, NULL); str = rb_str_new(0, len); p = (unsigned char *)RSTRING_PTR(str); if (i2d_X509_REQ(req, &p) <= 0) |