nobu	2008-08-29 12:19:15 +0900 (Fri, 29 Aug 2008)

  New Revision: 18917

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18917

  Log:
    * 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_x509name.c (ossl_x509name_initialize): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl_ocsp.c
    trunk/ext/openssl/ossl_x509attr.c
    trunk/ext/openssl/ossl_x509name.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18916)
+++ ChangeLog	(revision 18917)
@@ -1,3 +1,12 @@
+Fri Aug 29 12:19:12 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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_x509name.c (ossl_x509name_initialize): ditto.
+
 Fri Aug 29 11:04:03 2008  NARUSE, Yui  <naruse@r...>
 
 	* encoding.c (rb_enc_compatible): ASCII compatible string and US-ASCII
Index: ext/openssl/ossl_x509attr.c
===================================================================
--- ext/openssl/ossl_x509attr.c	(revision 18916)
+++ ext/openssl/ossl_x509attr.c	(revision 18917)
@@ -92,7 +92,7 @@
 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 @@
 	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;
Index: ext/openssl/ossl_ocsp.c
===================================================================
--- ext/openssl/ossl_ocsp.c	(revision 18916)
+++ ext/openssl/ossl_ocsp.c	(revision 18917)
@@ -107,11 +107,13 @@
 
     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");
 	}
     }
Index: ext/openssl/ossl_x509name.c
===================================================================
--- ext/openssl/ossl_x509name.c	(revision 18916)
+++ ext/openssl/ossl_x509name.c	(revision 18917)
@@ -137,13 +137,14 @@
 	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);
 	    }
-            DATA_PTR(self) = x;
 	}
     }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/