summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/openssl.c
diff options
context:
space:
mode:
authorbcook <>2015-09-13 12:41:01 +0000
committerbcook <>2015-09-13 12:41:01 +0000
commite2751f37728059d10cda50d45e3365a1110f26ff (patch)
treea928062f329b4a2f81c6d2b9910fde8181243c7a /src/usr.bin/openssl/openssl.c
parent2555ca7b86c3ba095a21111d3f7d00e279de8e4d (diff)
downloadopenbsd-e2751f37728059d10cda50d45e3365a1110f26ff.tar.gz
openbsd-e2751f37728059d10cda50d45e3365a1110f26ff.tar.bz2
openbsd-e2751f37728059d10cda50d45e3365a1110f26ff.zip
Factor out setup_up / destroy_ui functions.
This pulls out and renames setup_ui/destroy_ui so we have something that can be replaced as-needed, moving the the console setup code for Windows to app_win.c in -portable, instead of needing a local patch to enable binary console mode ui_read/write are also simplified.
Diffstat (limited to 'src/usr.bin/openssl/openssl.c')
-rw-r--r--src/usr.bin/openssl/openssl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index 653329f7c6..d0c0ec0551 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: openssl.c,v 1.9 2015/09/12 19:34:07 lteo Exp $ */ 1/* $OpenBSD: openssl.c,v 1.10 2015/09/13 12:41:01 bcook Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -405,14 +405,14 @@ openssl_startup(void)
405 SSL_library_init(); 405 SSL_library_init();
406 SSL_load_error_strings(); 406 SSL_load_error_strings();
407 407
408 setup_ui_method(); 408 setup_ui();
409} 409}
410 410
411static void 411static void
412openssl_shutdown(void) 412openssl_shutdown(void)
413{ 413{
414 CONF_modules_unload(1); 414 CONF_modules_unload(1);
415 destroy_ui_method(); 415 destroy_ui();
416 OBJ_cleanup(); 416 OBJ_cleanup();
417 EVP_cleanup(); 417 EVP_cleanup();
418 CRYPTO_cleanup_all_ex_data(); 418 CRYPTO_cleanup_all_ex_data();