diff options
| author | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-06 08:11:24 +0000 |
|---|---|---|
| committer | rhe <rhe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-06-06 08:11:24 +0000 |
| commit | c487224f48aceb3a8162680be3a1cc61e47f99c8 (patch) | |
| tree | 40956d8ecde80b583d9516c934dfe41cf6761173 | |
| parent | 2f49aa8f62c5e1c99dabf453fc162129430ebd95 (diff) | |
openssl: fix free function of OpenSSL::Cipher
* ext/openssl/ossl_cipher.c (ossl_cipher_free): Use EVP_CIPHER_CTX_free()
to free EVP_CIPHER_CTX allocated by EVP_CIPHER_CTX_new().
[ruby-core:75225] [Feature #12324]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl_cipher.c | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Mon Jun 6 17:10:50 2016 Kazuki Yamaguchi <k@rhe.jp> + + * ext/openssl/ossl_cipher.c (ossl_cipher_free): Use EVP_CIPHER_CTX_free() + to free EVP_CIPHER_CTX allocated by EVP_CIPHER_CTX_new(). + [ruby-core:75225] [Feature #12324] + Mon Jun 6 13:37:08 2016 Martin Duerst <duerst@it.aoyama.ac.jp> * string.c Change rb_str_casemap to use encoding primitive diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c index 54e363faa2..e1408b9198 100644 --- a/ext/openssl/ossl_cipher.c +++ b/ext/openssl/ossl_cipher.c @@ -81,11 +81,7 @@ ossl_cipher_new(const EVP_CIPHER *cipher) static void ossl_cipher_free(void *ptr) { - EVP_CIPHER_CTX *ctx = ptr; - if (ctx) { - EVP_CIPHER_CTX_cleanup(ctx); - ruby_xfree(ctx); - } + EVP_CIPHER_CTX_free(ptr); } static VALUE |