diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-01-26 19:10:29 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-01-26 19:10:29 +0000 |
| commit | 6cf8931a2f9fa26b2d9bdba6f1915f655e6bf25f (patch) | |
| tree | 38524daaff4806b24b9b140615ce1c3850784d8e /crypto/openssl/apps/ec.c | |
| parent | ee80cc1b1cd77939b98079da917464bf2dfaefb4 (diff) | |
| parent | 5315173646e65b5025be33013edc33eb9658e683 (diff) | |
| download | src-6cf8931a2f9fa26b2d9bdba6f1915f655e6bf25f.tar.gz src-6cf8931a2f9fa26b2d9bdba6f1915f655e6bf25f.zip | |
Merge OpenSSL 1.0.2k.
Notes
Notes:
svn path=/head/; revision=312825
Diffstat (limited to 'crypto/openssl/apps/ec.c')
| -rw-r--r-- | crypto/openssl/apps/ec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssl/apps/ec.c b/crypto/openssl/apps/ec.c index b04dadaf18c0..d2263c87392e 100644 --- a/crypto/openssl/apps/ec.c +++ b/crypto/openssl/apps/ec.c @@ -95,6 +95,7 @@ int MAIN(int argc, char **argv) int informat, outformat, text = 0, noout = 0; int pubin = 0, pubout = 0, param_out = 0; char *infile, *outfile, *prog, *engine; + ENGINE *e = NULL; char *passargin = NULL, *passargout = NULL; char *passin = NULL, *passout = NULL; point_conversion_form_t form = POINT_CONVERSION_UNCOMPRESSED; @@ -235,9 +236,7 @@ int MAIN(int argc, char **argv) ERR_load_crypto_strings(); -# ifndef OPENSSL_NO_ENGINE - setup_engine(bio_err, engine, 0); -# endif + e = setup_engine(bio_err, engine, 0); if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) { BIO_printf(bio_err, "Error getting passwords\n"); @@ -349,6 +348,7 @@ int MAIN(int argc, char **argv) BIO_free_all(out); if (eckey) EC_KEY_free(eckey); + release_engine(e); if (passin) OPENSSL_free(passin); if (passout) |