From ef5ce7029d1cc25ca9026f55bcc5d37253dd6480 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Mon, 23 Aug 2004 23:59:44 +0000 Subject: * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): d2i functions may replace the pointer indicated by the first argument. * ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto. * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ossl_x509attr.c | 5 +++-- ext/openssl/ossl_x509ext.c | 6 +++--- ext/openssl/ossl_x509name.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'ext') diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c index 576ad4c40a..f03302d352 100644 --- a/ext/openssl/ossl_x509attr.c +++ b/ext/openssl/ossl_x509attr.c @@ -91,12 +91,13 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self) X509_ATTRIBUTE *attr; unsigned char *p; + GetX509Attr(self, attr); if(rb_scan_args(argc, argv, "11", &oid, &value) == 1){ - GetX509Attr(self, attr); oid = ossl_to_der_if_possible(oid); StringValue(oid); p = RSTRING(oid)->ptr; - if(!d2i_X509_ATTRIBUTE(&attr, &p, RSTRING(oid)->len)){ + if(!d2i_X509_ATTRIBUTE((X509_ATTRIBUTE**)&DATA_PTR(self), + &p, RSTRING(oid)->len)){ ossl_raise(eX509AttrError, NULL); } return self; diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c index f0ce068d6b..57e005489a 100644 --- a/ext/openssl/ossl_x509ext.c +++ b/ext/openssl/ossl_x509ext.c @@ -260,13 +260,13 @@ ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self) unsigned char *p; X509_EXTENSION *ext; + GetX509Ext(self, ext); if(rb_scan_args(argc, argv, "12", &oid, &value, &critical) == 1){ - /* evaluate oid as a DER string */ oid = ossl_to_der_if_possible(oid); StringValue(oid); - GetX509Ext(self, ext); p = RSTRING(oid)->ptr; - if(!d2i_X509_EXTENSION(&ext, &p, RSTRING(oid)->len)) + if(!d2i_X509_EXTENSION((X509_EXTENSION**)&DATA_PTR(self), + &p, RSTRING(oid)->len)) ossl_raise(eX509ExtError, NULL); return self; } diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c index ee414b6066..b198157504 100644 --- a/ext/openssl/ossl_x509name.c +++ b/ext/openssl/ossl_x509name.c @@ -130,7 +130,7 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self) VALUE str = ossl_to_der_if_possible(arg); StringValue(str); p = RSTRING(str)->ptr; - if(!d2i_X509_NAME(&name, &p, RSTRING(str)->len)){ + if(!d2i_X509_NAME((X509_NAME**)&DATA_PTR(self), &p, RSTRING(str)->len)){ ossl_raise(eX509NameError, NULL); } } -- cgit v1.2.3