summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/apps/x509.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2017-01-26 19:14:14 +0000
committerjkim <jkim@FreeBSD.org>2017-01-26 19:14:14 +0000
commit4aed7e4ccd53660aa6e7f0b024a4ce55a3227abc (patch)
treef87776322a432fb3baf9f4ce835356d8b54ff8a7 /crypto/openssl/apps/x509.c
parent778f6f84c2d897983421773093f18137a785cb40 (diff)
downloadFreeBSD-src-4aed7e4ccd53660aa6e7f0b024a4ce55a3227abc.zip
FreeBSD-src-4aed7e4ccd53660aa6e7f0b024a4ce55a3227abc.tar.gz
MFC: r312825
Merge OpenSSL 1.0.2k.
Diffstat (limited to 'crypto/openssl/apps/x509.c')
-rw-r--r--crypto/openssl/apps/x509.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/crypto/openssl/apps/x509.c b/crypto/openssl/apps/x509.c
index 17cb62d..ad9fc98 100644
--- a/crypto/openssl/apps/x509.c
+++ b/crypto/openssl/apps/x509.c
@@ -218,9 +218,7 @@ int MAIN(int argc, char **argv)
char *checkhost = NULL;
char *checkemail = NULL;
char *checkip = NULL;
-#ifndef OPENSSL_NO_ENGINE
char *engine = NULL;
-#endif
reqfile = 0;
@@ -501,9 +499,7 @@ int MAIN(int argc, char **argv)
BIO_printf(bio_err, "%s", *pp);
goto end;
}
-#ifndef OPENSSL_NO_ENGINE
e = setup_engine(bio_err, engine, 0);
-#endif
if (need_rand)
app_RAND_load_file(NULL, bio_err, 0);
@@ -1040,6 +1036,7 @@ int MAIN(int argc, char **argv)
ASN1_INTEGER_free(sno);
sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);
sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
+ release_engine(e);
if (passin)
OPENSSL_free(passin);
apps_shutdown();
OpenPOWER on IntegriCloud