diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2017-01-26 18:32:12 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2017-01-26 18:32:12 +0000 |
| commit | 5315173646e65b5025be33013edc33eb9658e683 (patch) | |
| tree | 06e2ebfcb3177eeb3cba0775d8e3ed98577e77da /apps/s_server.c | |
| parent | e656c34a188598ebce6423c4fbc4860921d41be4 (diff) | |
| download | src-5315173646e65b5025be33013edc33eb9658e683.tar.gz src-5315173646e65b5025be33013edc33eb9658e683.zip | |
Import OpenSSL 1.0.2k.vendor/openssl/1.0.2k
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=312823
svn path=/vendor-crypto/openssl/1.0.2k/; revision=312824; tag=vendor/openssl/1.0.2k
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 857a70e3e4c5..b561cf3a362b 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -328,9 +328,7 @@ static char *keymatexportlabel = NULL; static int keymatexportlen = 20; static int hack = 0; -#ifndef OPENSSL_NO_ENGINE static char *engine_id = NULL; -#endif static const char *session_id_prefix = NULL; static int enable_timeouts = 0; @@ -484,9 +482,7 @@ static void s_server_init(void) s_quiet = 0; s_brief = 0; hack = 0; -# ifndef OPENSSL_NO_ENGINE engine_id = NULL; -# endif } #endif @@ -1603,9 +1599,7 @@ int MAIN(int argc, char *argv[]) SSL_load_error_strings(); OpenSSL_add_ssl_algorithms(); -#ifndef OPENSSL_NO_ENGINE e = setup_engine(bio_err, engine_id, 1); -#endif if (!app_passwd(bio_err, passarg, dpassarg, &pass, &dpass)) { BIO_printf(bio_err, "Error getting password\n"); @@ -2129,6 +2123,7 @@ int MAIN(int argc, char *argv[]) if (jpake_secret && psk_key) OPENSSL_free(psk_key); #endif + release_engine(e); if (bio_s_out != NULL) { BIO_free(bio_s_out); bio_s_out = NULL; |