* 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

1 files changed, 8 insertions, 22 deletions

diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index 750d8ad87f..c3a371a008 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -167,41 +167,27 @@ ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
     switch (base) {
     case 0:
 	len = BN_bn2mpi(bn, NULL);
-	if (!(buf = OPENSSL_malloc(len))) {
-	    ossl_raise(eBNError, "Cannot allocate mem for BN");
-	}
-	if (BN_bn2mpi(bn, buf) != len) {
-	    OPENSSL_free(buf);
+        str = rb_str_new(0, len);
+	if (BN_bn2mpi(bn, RSTRING(str)->ptr) != len)
 	    ossl_raise(eBNError, NULL);
-	}
 	break;
     case 2:
 	len = BN_num_bytes(bn);
-	if (!(buf = OPENSSL_malloc(len))) {
-	    ossl_raise(eBNError, "Cannot allocate mem for BN");
-	}
-	if (BN_bn2bin(bn, buf) != len) {
-	    OPENSSL_free(buf);
+        str = rb_str_new(0, len);
+	if (BN_bn2bin(bn, RSTRING(str)->ptr) != len)
 	    ossl_raise(eBNError, NULL);
-	}
 	break;
     case 10:
-	if (!(buf = BN_bn2dec(bn))) {
-	    ossl_raise(eBNError, NULL);
-	}
-	len = strlen(buf);
+	if (!(buf = BN_bn2dec(bn))) ossl_raise(eBNError, NULL);
+	str = ossl_buf2str(buf, strlen(buf));
 	break;
     case 16:
-	if (!(buf = BN_bn2hex(bn))) {
-	    ossl_raise(eBNError, NULL);
-	}
-	len = strlen(buf);
+	if (!(buf = BN_bn2hex(bn))) ossl_raise(eBNError, NULL);
+	str = ossl_buf2str(buf, strlen(buf));
 	break;
     default:
 	ossl_raise(rb_eArgError, "illegal radix %d", base);
     }
-    str = rb_str_new(buf, len);
-    OPENSSL_free(buf);
 
     return str;
 }