diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ext/openssl/ossl_ocsp.c | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509attr.c | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509ext.c | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_x509name.c | 6 | ||||
| -rw-r--r-- | version.h | 6 |
6 files changed, 30 insertions, 11 deletions
@@ -1,3 +1,14 @@ +Sat Aug 30 14:59:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): fix for + initialization of r18168. + + * ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): ditto. + + * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto. + + * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto. + Thu Aug 21 17:30:32 2008 Akinori MUSHA <knu@iDaemons.org> * enumerator.c (enumerator_ptr), lib/generator.rb: diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c index 6c6b5e8c42..36a3dd7049 100644 --- a/ext/openssl/ossl_ocsp.c +++ b/ext/openssl/ossl_ocsp.c @@ -107,11 +107,13 @@ ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self) rb_scan_args(argc, argv, "01", &arg); if(!NIL_P(arg)){ - OCSP_REQUEST *req = DATA_PTR(self); + OCSP_REQUEST *req = DATA_PTR(self), *x; arg = ossl_to_der_if_possible(arg); StringValue(arg); p = (unsigned char*)RSTRING_PTR(arg); - if(!d2i_OCSP_REQUEST(&req, &p, RSTRING_LEN(arg)) && (DATA_PTR(self) = req, 1)){ + x = d2i_OCSP_REQUEST(&req, &p, RSTRING_LEN(arg)); + DATA_PTR(self) = req; + if(!x){ ossl_raise(eOCSPError, "cannot load DER encoded request"); } } diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c index a876ed5af2..1f817cdafe 100644 --- a/ext/openssl/ossl_x509attr.c +++ b/ext/openssl/ossl_x509attr.c @@ -92,7 +92,7 @@ static VALUE ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self) { VALUE oid, value; - X509_ATTRIBUTE *attr; + X509_ATTRIBUTE *attr, *x; const unsigned char *p; GetX509Attr(self, attr); @@ -100,7 +100,9 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self) oid = ossl_to_der_if_possible(oid); StringValue(oid); p = (unsigned char *)RSTRING_PTR(oid); - if(!d2i_X509_ATTRIBUTE(&attr, &p, RSTRING_LEN(oid)) && (DATA_PTR(self) = attr, 1)){ + x = d2i_X509_ATTRIBUTE(&attr, &p, RSTRING_LEN(oid)); + DATA_PTR(self) = attr; + if(!x){ ossl_raise(eX509AttrError, NULL); } return self; diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c index c7b180c8b7..ca29c6c456 100644 --- a/ext/openssl/ossl_x509ext.c +++ b/ext/openssl/ossl_x509ext.c @@ -274,14 +274,16 @@ ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self) { VALUE oid, value, critical; const unsigned char *p; - X509_EXTENSION *ext, *x = DATA_PTR(self); + X509_EXTENSION *ext, *x; GetX509Ext(self, ext); if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){ oid = ossl_to_der_if_possible(oid); StringValue(oid); p = (unsigned char *)RSTRING_PTR(oid); - if(!d2i_X509_EXTENSION(&x, &p, RSTRING_LEN(oid)) && (DATA_PTR(self) = x, 1)) + x = d2i_X509_EXTENSION(&ext, &p, RSTRING_LEN(oid)); + DATA_PTR(self) = ext; + if(!x) ossl_raise(eX509ExtError, NULL); return self; } diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index 8d80cd5986..617e616c95 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -137,10 +137,12 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self) else{ const unsigned char *p; VALUE str = ossl_to_der_if_possible(arg); - X509_NAME *x = DATA_PTR(self); + X509_NAME *x; StringValue(str); p = (unsigned char *)RSTRING_PTR(str); - if(!d2i_X509_NAME(&x, &p, RSTRING_LEN(str)) && (DATA_PTR(self) = x, 1)){ + x = d2i_X509_NAME(&name, &p, RSTRING_LEN(str)); + DATA_PTR(self) = name; + if(!x){ ossl_raise(eX509NameError, NULL); } } @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2008-08-21" +#define RUBY_RELEASE_DATE "2008-08-30" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20080821 +#define RUBY_RELEASE_CODE 20080830 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 21 +#define RUBY_RELEASE_DAY 30 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |