From 9a24d3d46b77fb4100d7eca4323d790bdea6bf0a Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 31 Aug 2024 10:28:03 +0000 Subject: [PATCH] Garbage collec UI_UTIL remnants ok beck jsing --- lib/libcrypto/Makefile | 3 +- lib/libcrypto/Symbols.list | 2 - lib/libcrypto/hidden/openssl/ui.h | 4 +- lib/libcrypto/ui/ui.h | 8 +--- lib/libcrypto/ui/ui_util.c | 75 ------------------------------- 5 files changed, 3 insertions(+), 89 deletions(-) delete mode 100644 lib/libcrypto/ui/ui_util.c diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index 090589559e7..5a28e98a87b 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.205 2024/08/31 09:29:03 tb Exp $ +# $OpenBSD: Makefile,v 1.206 2024/08/31 10:28:03 tb Exp $ LIB= crypto LIBREBUILD=y @@ -544,7 +544,6 @@ SRCS+= ui_err.c SRCS+= ui_lib.c SRCS+= ui_null.c SRCS+= ui_openssl.c -SRCS+= ui_util.c # whrlpool/ SRCS+= whirlpool.c diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list index 89cfae2f2a1..170ae8ceae4 100644 --- a/lib/libcrypto/Symbols.list +++ b/lib/libcrypto/Symbols.list @@ -2279,8 +2279,6 @@ TXT_DB_insert TXT_DB_read TXT_DB_write UI_OpenSSL -UI_UTIL_read_pw -UI_UTIL_read_pw_string UI_add_error_string UI_add_info_string UI_add_input_boolean diff --git a/lib/libcrypto/hidden/openssl/ui.h b/lib/libcrypto/hidden/openssl/ui.h index bf5fb692484..7bf849d4c38 100644 --- a/lib/libcrypto/hidden/openssl/ui.h +++ b/lib/libcrypto/hidden/openssl/ui.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ui.h,v 1.4 2024/08/24 07:51:19 tb Exp $ */ +/* $OpenBSD: ui.h,v 1.5 2024/08/31 10:28:03 tb Exp $ */ /* * Copyright (c) 2022 Bob Beck * @@ -75,8 +75,6 @@ LCRYPTO_USED(UI_get0_test_string); LCRYPTO_USED(UI_get_result_minsize); LCRYPTO_USED(UI_get_result_maxsize); LCRYPTO_USED(UI_set_result); -LCRYPTO_UNUSED(UI_UTIL_read_pw_string); -LCRYPTO_UNUSED(UI_UTIL_read_pw); LCRYPTO_USED(ERR_load_UI_strings); LCRYPTO_USED(UI_method_get_prompt_constructor); diff --git a/lib/libcrypto/ui/ui.h b/lib/libcrypto/ui/ui.h index c6884313941..e297e9fbaf2 100644 --- a/lib/libcrypto/ui/ui.h +++ b/lib/libcrypto/ui/ui.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ui.h,v 1.18 2023/04/18 08:33:43 tb Exp $ */ +/* $OpenBSD: ui.h,v 1.19 2024/08/31 10:28:03 tb Exp $ */ /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL * project 2001. */ @@ -364,12 +364,6 @@ int UI_get_result_maxsize(UI_STRING *uis); /* Set the result of a UI_STRING. */ int UI_set_result(UI *ui, UI_STRING *uis, const char *result); -/* A couple of popular utility functions */ -int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, - int verify); -int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt, - int verify); - void ERR_load_UI_strings(void); /* Error codes for the UI functions. */ diff --git a/lib/libcrypto/ui/ui_util.c b/lib/libcrypto/ui/ui_util.c deleted file mode 100644 index ad7adc5fc1b..00000000000 --- a/lib/libcrypto/ui/ui_util.c +++ /dev/null @@ -1,75 +0,0 @@ -/* $OpenBSD: ui_util.c,v 1.16 2024/08/24 07:50:23 tb Exp $ */ -/* ==================================================================== - * Copyright (c) 2001-2002 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - -#include -#include - -#include - -/* XXX - remove in next bump. */ - -int -UI_UTIL_read_pw_string(char *buf, int length, const char *prompt, int verify) -{ - return -1; -} -LCRYPTO_ALIAS(UI_UTIL_read_pw_string); - -int -UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt, int verify) -{ - return -1; -} -LCRYPTO_ALIAS(UI_UTIL_read_pw); -- 2.20.1