From 30103702c367c5cdaa18b6a622f3916cec6c701e Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Wed, 17 Sep 2003 09:05:02 +0000 Subject: * 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 --- ext/openssl/ossl_hmac.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'ext/openssl/ossl_hmac.c') diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c index ffd5ec3841..1e5d5bc09c 100644 --- a/ext/openssl/ossl_hmac.c +++ b/ext/openssl/ossl_hmac.c @@ -124,8 +124,7 @@ ossl_hmac_digest(VALUE self) GetHMAC(self, ctx); hmac_final(ctx, &buf, &buf_len); - digest = rb_str_new(buf, buf_len); - OPENSSL_free(buf); + ossl_buf2str(buf, buf_len); return digest; } @@ -144,9 +143,8 @@ ossl_hmac_hexdigest(VALUE self) OPENSSL_free(buf); ossl_raise(eHMACError, "Memory alloc error"); } - hexdigest = rb_str_new(hexbuf, 2 * buf_len); OPENSSL_free(buf); - OPENSSL_free(hexbuf); + hexdigest = ossl_buf2str(hexbuf, 2 * buf_len); return hexdigest; } @@ -180,9 +178,8 @@ ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data) if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) { ossl_raise(eHMACError, "Cannot convert buf to hexbuf"); } - hexdigest = rb_str_new(hexbuf, 2 * buf_len); - OPENSSL_free(hexbuf); - + hexdigest = ossl_buf2str(hexbuf, 2 * buf_len); + return hexdigest; } -- cgit v1.2.3