ENGINE fixes

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-10-23 18:46:58 +01:00
parent cda302d94f
commit 5196641617
2 changed files with 11 additions and 1 deletions

View File

@ -65,6 +65,9 @@
#include <string.h> #include <string.h>
#include "ec_lcl.h" #include "ec_lcl.h"
#include <openssl/err.h> #include <openssl/err.h>
#ifndef OPENSSSL_NO_ENGINE
# include <openssl/engine.h>
#endif
EC_KEY *EC_KEY_new(void) EC_KEY *EC_KEY_new(void)
{ {
@ -104,6 +107,11 @@ void EC_KEY_free(EC_KEY *r)
} }
#endif #endif
#ifndef OPENSSL_NO_ENGINE
if (r->engine)
ENGINE_finish(r->engine);
#endif
EC_GROUP_free(r->group); EC_GROUP_free(r->group);
EC_POINT_free(r->pub_key); EC_POINT_free(r->pub_key);
BN_clear_free(r->priv_key); BN_clear_free(r->priv_key);

View File

@ -53,7 +53,9 @@
*/ */
#include <openssl/ec.h> #include <openssl/ec.h>
#ifndef OPENSSL_NO_ENGINE
# include <openssl/engine.h> # include <openssl/engine.h>
#endif
#include <openssl/err.h> #include <openssl/err.h>
#include "ec_lcl.h" #include "ec_lcl.h"