diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2011-11-03 02:34:34 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2011-11-03 02:34:34 +0000 |
| commit | 83e0d2b6dc9f5d1e1d9da1d5fb2b3e4a1b95ed29 (patch) | |
| tree | b4be7ab0261dff4bf6e721d276b191619415c6e4 /lib/libcrypto/evp/p_lib.c | |
| parent | ce9ed2f66babb3442b71c8a7b580758c546d433a (diff) | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'lib/libcrypto/evp/p_lib.c')
| -rw-r--r-- | lib/libcrypto/evp/p_lib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/libcrypto/evp/p_lib.c b/lib/libcrypto/evp/p_lib.c index 1916c616991..e26ccd0d086 100644 --- a/lib/libcrypto/evp/p_lib.c +++ b/lib/libcrypto/evp/p_lib.c @@ -411,7 +411,10 @@ void EVP_PKEY_free(EVP_PKEY *x) static void EVP_PKEY_free_it(EVP_PKEY *x) { if (x->ameth && x->ameth->pkey_free) + { x->ameth->pkey_free(x); + x->pkey.ptr = NULL; + } #ifndef OPENSSL_NO_ENGINE if (x->engine) { |