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_cipher.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_cipher.c')
-rw-r--r-- | ext/openssl/ossl_cipher.c | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c index b639af2035..93b3f6ccf9 100644 --- a/ext/openssl/ossl_cipher.c +++ b/ext/openssl/ossl_cipher.c @@ -122,13 +122,13 @@ ossl_cipher_copy(VALUE self, VALUE other) static VALUE ossl_cipher_reset(VALUE self) { - EVP_CIPHER_CTX *ctx; + EVP_CIPHER_CTX *ctx; - GetCipher(self, ctx); - if (EVP_CipherInit(ctx, NULL, NULL, NULL, -1) != 1) - ossl_raise(eCipherError, NULL); + GetCipher(self, ctx); + if (EVP_CipherInit(ctx, NULL, NULL, NULL, -1) != 1) + ossl_raise(eCipherError, NULL); - return self; + return self; } static VALUE @@ -232,25 +232,20 @@ static VALUE ossl_cipher_update(VALUE self, VALUE data) { EVP_CIPHER_CTX *ctx; - char *in, *out; + char *in; int in_len, out_len; VALUE str; GetCipher(self, ctx); - StringValue(data); in = RSTRING(data)->ptr; in_len = RSTRING(data)->len; - - if (!(out = OPENSSL_malloc(in_len+EVP_CIPHER_CTX_block_size(ctx)))) { + str = rb_str_new(0, in_len+EVP_CIPHER_CTX_block_size(ctx)); + if (!EVP_CipherUpdate(ctx, RSTRING(str)->ptr, &out_len, in, in_len)) ossl_raise(eCipherError, NULL); - } - if (!EVP_CipherUpdate(ctx, out, &out_len, in, in_len)) { - OPENSSL_free(out); - ossl_raise(eCipherError, NULL); - } - str = rb_str_new(out, out_len); - OPENSSL_free(out); + assert(out_len < RSTRING(str)->len); + RSTRING(str)->len = out_len; + RSTRING(str)->ptr[out_len] = 0; return str; } @@ -259,23 +254,17 @@ static VALUE ossl_cipher_final(VALUE self) { EVP_CIPHER_CTX *ctx; - char *out; int out_len; VALUE str; GetCipher(self, ctx); - - if (!(out = OPENSSL_malloc(EVP_CIPHER_CTX_block_size(ctx)))) { + str = rb_str_new(0, EVP_CIPHER_CTX_block_size(ctx)); + if (!EVP_CipherFinal(ctx, RSTRING(str)->ptr, &out_len)) ossl_raise(eCipherError, NULL); - } - if (!EVP_CipherFinal(ctx, out, &out_len)) { - OPENSSL_free(out); - ossl_raise(eCipherError, NULL); - } + assert(out_len <= RSTRING(str)->len); + RSTRING(str)->len = out_len; + RSTRING(str)->ptr[out_len] = 0; - str = rb_str_new(out, out_len); - OPENSSL_free(out); - return str; } |