Commit 4c62066c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Revert "openssl: engine: remove double-free" 

This reverts commit 370ee919.

Issue #509 has all the details but it was confirmed that the crash was
not due to this, so the previous commit was wrong.
parent 9b87078d

lib/vtls/openssl.c

+2 −2
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ int cert_stuff(struct connectdata *conn, 
      break;

    case SSL_FILETYPE_ENGINE:

#ifdef HAVE_OPENSSL_ENGINE_H

      {

      {                         /* XXXX still needs some work */

        EVP_PKEY *priv_key = NULL;

        if(data->state.engine) {

#ifdef HAVE_ENGINE_LOAD_FOUR_ARGS
@@ -592,7 +592,7 @@ int cert_stuff(struct connectdata *conn, 
            EVP_PKEY_free(priv_key);

            return 0;

          }

          /* ownership of priv_key was handed over, no need to free it here */

          EVP_PKEY_free(priv_key);  /* we don't need the handle any more... */

        }

        else {

          failf(data, "crypto engine not set, can't load private key");