diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-17 09:05:02 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-17 09:05:02 +0000 |
commit | 30103702c367c5cdaa18b6a622f3916cec6c701e (patch) | |
tree | c236089aa9c6b4183729735e221606a9b536d217 /ext/openssl/ossl_x509cert.c | |
parent | 12196ee24fce0e601106036e67526819cac07291 (diff) |
* ext/openssl: all files are reviewed to simplify and avoid memory leak.
* ext/openssl/extconf.rb: add check for assert.h.
* ext/openssl/ossl.c (ossl_buf2str): new function to convert
C buffer to String and free buffer.
* ext/openssl/ossl.c (ossl_x509_ary2sk): new function to convert
Array of OpenSSL::X509 to STACK_OF(X509) with exception safe.
* ext/openssl/ossl.c (ossl_to_der, ossl_to_der_if_possible): new
functions to convert object to DER string.
* ext/openssl/ossl.h: ditto.
* ext/openssl/ossl_bio.c (ossl_membio2str): new function to convert
BIO to String object and free BIO.
* ext/openssl/ossl_bio.h: ditto.
* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_to_der): add for "to_der".
* ext/openssl/ossl_x509name.c (ossl_x509name_to_der): ditto.
* ext/openssl/ossl_x509ext.c (ossl_x509ext_to_der): ditto.
* ext/openssl/ossl_x509ext.c (create_ext_from_array): removed
and reimplement in openssl/x509.rb.
* ext/openssl/ossl_x509attr.c: reimplemented and disable some
method temporarily. this class doesn't work fine without ASN.1
data support;-) I'll rewrite in near future.
* ext/openssl/lib/openssl/x509.c (X509::Attribute): get rid off
unused code.
* ext/openssl/lib/openssl/x509.c (X509::ExtensionFactory): refine all.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl_x509cert.c')
-rw-r--r-- | ext/openssl/ossl_x509cert.c | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c index b689f578dc..443a2ba4c3 100644 --- a/ext/openssl/ossl_x509cert.c +++ b/ext/openssl/ossl_x509cert.c @@ -136,13 +136,8 @@ ossl_x509_initialize(int argc, VALUE *argv, VALUE self) /* create just empty X509Cert */ return self; } + arg = ossl_to_der_if_possible(arg); in = ossl_obj2bio(arg); - - /* - * TODO: - * Check if we could free old X509 - X509_free(DATA_PTR(self)); - */ x509 = PEM_read_bio_X509(in, (X509 **)&DATA_PTR(self), NULL, NULL); if (!x509) { BIO_reset(in); @@ -178,22 +173,18 @@ static VALUE ossl_x509_to_der(VALUE self) { X509 *x509; - BIO *out; VALUE str; - int status=0; + long len; + unsigned char *p; GetX509(self, x509); - - out = BIO_new(BIO_s_mem()); - if (!out) ossl_raise(eX509CertError, NULL); - - if (!i2d_X509_bio(out, x509)) { - BIO_free(out); + if ((len = i2d_X509(x509, NULL)) <= 0) ossl_raise(eX509CertError, NULL); - } - str = ossl_protect_membio2str(out, &status); - BIO_free(out); - if (status) rb_jump_tag(status); + str = rb_str_new(0, len); + p = RSTRING(str)->ptr; + if (i2d_X509(x509, &p) <= 0) + ossl_raise(eX509CertError, NULL); + ossl_str_adjust(str, p); return str; } @@ -204,7 +195,6 @@ ossl_x509_to_pem(VALUE self) X509 *x509; BIO *out; VALUE str; - int status=0; GetX509(self, x509); out = BIO_new(BIO_s_mem()); @@ -214,9 +204,7 @@ ossl_x509_to_pem(VALUE self) BIO_free(out); ossl_raise(eX509CertError, NULL); } - str = ossl_protect_membio2str(out, &status); - BIO_free(out); - if (status) rb_jump_tag(status); + str = ossl_membio2str(out); return str; } @@ -227,7 +215,6 @@ ossl_x509_to_text(VALUE self) X509 *x509; BIO *out; VALUE str; - int status=0; GetX509(self, x509); @@ -238,9 +225,7 @@ ossl_x509_to_text(VALUE self) BIO_free(out); ossl_raise(eX509CertError, NULL); } - str = ossl_protect_membio2str(out, &status); - BIO_free(out); - if (status) rb_jump_tag(status); + str = ossl_membio2str(out); return str; } @@ -323,7 +308,6 @@ ossl_x509_get_signature_algorithm(VALUE self) X509 *x509; BIO *out; VALUE str; - int status=0; GetX509(self, x509); @@ -334,9 +318,7 @@ ossl_x509_get_signature_algorithm(VALUE self) BIO_free(out); ossl_raise(eX509CertError, NULL); } - str = ossl_protect_membio2str(out, &status); - BIO_free(out); - if (status) rb_jump_tag(status); + str = ossl_membio2str(out); return str; } |