From b1ddde874c215cc8891531ed92876f091b7eb83e Mon Sep 17 00:00:00 2001 From: cvs2svn Date: Mon, 14 Apr 2025 17:32:06 +0000 Subject: This commit was manufactured by cvs2git to create tag 'tb_20250414'. --- src/lib/libcrypto/ui/ui.h | 397 ----------------- src/lib/libcrypto/ui/ui_err.c | 98 ---- src/lib/libcrypto/ui/ui_lib.c | 907 -------------------------------------- src/lib/libcrypto/ui/ui_local.h | 152 ------- src/lib/libcrypto/ui/ui_null.c | 18 - src/lib/libcrypto/ui/ui_openssl.c | 398 ----------------- 6 files changed, 1970 deletions(-) delete mode 100644 src/lib/libcrypto/ui/ui.h delete mode 100644 src/lib/libcrypto/ui/ui_err.c delete mode 100644 src/lib/libcrypto/ui/ui_lib.c delete mode 100644 src/lib/libcrypto/ui/ui_local.h delete mode 100644 src/lib/libcrypto/ui/ui_null.c delete mode 100644 src/lib/libcrypto/ui/ui_openssl.c (limited to 'src/lib/libcrypto/ui') diff --git a/src/lib/libcrypto/ui/ui.h b/src/lib/libcrypto/ui/ui.h deleted file mode 100644 index cc400c2d5a..0000000000 --- a/src/lib/libcrypto/ui/ui.h +++ /dev/null @@ -1,397 +0,0 @@ -/* $OpenBSD: ui.h,v 1.20 2025/03/09 15:25:53 tb Exp $ */ -/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL - * project 2001. - */ -/* ==================================================================== - * Copyright (c) 2001 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). - * - */ - -#ifndef HEADER_UI_H -#define HEADER_UI_H - -#include - -#include -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* Declared already in ossl_typ.h */ -/* typedef struct ui_st UI; */ -/* typedef struct ui_method_st UI_METHOD; */ - - -/* - * All the following functions return -1 or NULL on error and in some cases - * (UI_process()) -2 if interrupted or in some other way cancelled. - * When everything is fine, they return 0, a positive value or a non-NULL - * pointer, all depending on their purpose. - */ - -/* Creators and destructor. */ -UI *UI_new(void); -UI *UI_new_method(const UI_METHOD *method); -void UI_free(UI *ui); - -/* - * The following functions are used to add strings to be printed and prompt - * strings to prompt for data. The names are UI_{add,dup}__string - * and UI_{add,dup}_input_boolean. - * - * UI_{add,dup}__string have the following meanings: - * add add a text or prompt string. The pointers given to these - * functions are used verbatim, no copying is done. - * dup make a copy of the text or prompt string, then add the copy - * to the collection of strings in the user interface. - * - * The function is a name for the functionality that the given - * string shall be used for. It can be one of: - * input use the string as data prompt. - * verify use the string as verification prompt. This - * is used to verify a previous input. - * info use the string for informational output. - * error use the string for error output. - * Honestly, there's currently no difference between info and error for the - * moment. - * - * UI_{add,dup}_input_boolean have the same semantics for "add" and "dup", - * and are typically used when one wants to prompt for a yes/no response. - * - * All of the functions in this group take a UI and a prompt string. - * The string input and verify addition functions also take a flag argument, - * a buffer for the result to end up in, a minimum input size and a maximum - * input size (the result buffer MUST be large enough to be able to contain - * the maximum number of characters). Additionally, the verify addition - * functions takes another buffer to compare the result against. - * The boolean input functions take an action description string (which should - * be safe to ignore if the expected user action is obvious, for example with - * a dialog box with an OK button and a Cancel button), a string of acceptable - * characters to mean OK and to mean Cancel. The two last strings are checked - * to make sure they don't have common characters. Additionally, the same - * flag argument as for the string input is taken, as well as a result buffer. - * The result buffer is required to be at least one byte long. Depending on - * the answer, the first character from the OK or the Cancel character strings - * will be stored in the first byte of the result buffer. No NUL will be - * added, so the result is *not* a string. - * - * On success, the functions all return an index of the added information. - * That index is useful when retrieving results with UI_get0_result(). - */ -int UI_add_input_string(UI *ui, const char *prompt, int flags, - char *result_buf, int minsize, int maxsize); -int UI_dup_input_string(UI *ui, const char *prompt, int flags, - char *result_buf, int minsize, int maxsize); -int UI_add_verify_string(UI *ui, const char *prompt, int flags, - char *result_buf, int minsize, int maxsize, const char *test_buf); -int UI_dup_verify_string(UI *ui, const char *prompt, int flags, - char *result_buf, int minsize, int maxsize, const char *test_buf); -int UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc, - const char *ok_chars, const char *cancel_chars, - int flags, char *result_buf); -int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc, - const char *ok_chars, const char *cancel_chars, - int flags, char *result_buf); -int UI_add_info_string(UI *ui, const char *text); -int UI_dup_info_string(UI *ui, const char *text); -int UI_add_error_string(UI *ui, const char *text); -int UI_dup_error_string(UI *ui, const char *text); - -/* These are the possible flags. They can be or'ed together. */ -/* Use to have echoing of input */ -#define UI_INPUT_FLAG_ECHO 0x01 -/* - * Use a default password. Where that password is found is completely - * up to the application, it might for example be in the user data set - * with UI_add_user_data(). It is not recommended to have more than - * one input in each UI being marked with this flag, or the application - * might get confused. - */ -#define UI_INPUT_FLAG_DEFAULT_PWD 0x02 - -/* - * Users of these routines may want to define flags of their own. The core - * UI won't look at those, but will pass them on to the method routines. They - * must use higher bits so they don't get confused with the UI bits above. - * UI_INPUT_FLAG_USER_BASE tells which is the lowest bit to use. A good - * example of use is this: - * - * #define MY_UI_FLAG1 (0x01 << UI_INPUT_FLAG_USER_BASE) - */ -#define UI_INPUT_FLAG_USER_BASE 16 - - -/* - * The following function helps construct a prompt. object_desc is a - * textual short description of the object, for example "pass phrase", - * and object_name is the name of the object (might be a card name or - * a file name. - * The returned string shall always be allocated on the heap with - * malloc(), and need to be free'd with free(). - * - * If the ui_method doesn't contain a pointer to a user-defined prompt - * constructor, a default string is built, looking like this: - * - * "Enter {object_desc} for {object_name}:" - * - * So, if object_desc has the value "pass phrase" and object_name has - * the value "foo.key", the resulting string is: - * - * "Enter pass phrase for foo.key:" - */ -char *UI_construct_prompt(UI *ui_method, const char *object_desc, - const char *object_name); - - -/* - * The following function is used to store a pointer to user-specific data. - * Any previous such pointer will be returned and replaced. - * - * For callback purposes, this function makes a lot more sense than using - * ex_data, since the latter requires that different parts of OpenSSL or - * applications share the same ex_data index. - * - * Note that the UI_OpenSSL() method completely ignores the user data. - * Other methods may not, however. - */ -void *UI_add_user_data(UI *ui, void *user_data); -/* We need a user data retrieving function as well. */ -void *UI_get0_user_data(UI *ui); - -/* Return the result associated with a prompt given with the index i. */ -const char *UI_get0_result(UI *ui, int i); - -/* When all strings have been added, process the whole thing. */ -int UI_process(UI *ui); - -/* - * Give a user interface parametrised control commands. This can be used to - * send down an integer, a data pointer or a function pointer, as well as - * be used to get information from a UI. - */ -int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f)(void)); - -/* The commands */ -/* - * Use UI_CONTROL_PRINT_ERRORS with the value 1 to have UI_process print the - * OpenSSL error stack before printing any info or added error messages and - * before any prompting. - */ -#define UI_CTRL_PRINT_ERRORS 1 -/* - * Check if a UI_process() is possible to do again with the same instance of - * a user interface. This makes UI_ctrl() return 1 if it is redoable, and 0 - * if not. - */ -#define UI_CTRL_IS_REDOABLE 2 - - -/* Some methods may use extra data */ -#define UI_set_app_data(s,arg) UI_set_ex_data(s,0,arg) -#define UI_get_app_data(s) UI_get_ex_data(s,0) -int UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, - CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); -int UI_set_ex_data(UI *r, int idx, void *arg); -void *UI_get_ex_data(UI *r, int idx); - -/* Use specific methods instead of the built-in one */ -void UI_set_default_method(const UI_METHOD *meth); -const UI_METHOD *UI_get_default_method(void); -const UI_METHOD *UI_get_method(UI *ui); -const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth); - -/* The method with all the built-in thingies */ -const UI_METHOD *UI_OpenSSL(void); - -const UI_METHOD *UI_null(void); - -/* - * ---------- For method writers ---------- - * A method contains a number of functions that implement the low level - * of the User Interface. The functions are: - * - * an opener This function starts a session, maybe by opening - * a channel to a tty, or by opening a window. - * a writer This function is called to write a given string, - * maybe to the tty, maybe as a field label in a - * window. - * a flusher This function is called to flush everything that - * has been output so far. It can be used to actually - * display a dialog box after it has been built. - * a reader This function is called to read a given prompt, - * maybe from the tty, maybe from a field in a - * window. Note that it's called with all string - * structures, not only the prompt ones, so it must - * check such things itself. - * a closer This function closes the session, maybe by closing - * the channel to the tty, or closing the window. - * - * All these functions are expected to return: - * - * 0 on error. - * 1 on success. - * -1 on out-of-band events, for example if some prompting has - * been canceled (by pressing Ctrl-C, for example). This is - * only checked when returned by the flusher or the reader. - * - * The way this is used, the opener is first called, then the writer for all - * strings, then the flusher, then the reader for all strings and finally the - * closer. Note that if you want to prompt from a terminal or other command - * line interface, the best is to have the reader also write the prompts - * instead of having the writer do it. If you want to prompt from a dialog - * box, the writer can be used to build up the contents of the box, and the - * flusher to actually display the box and run the event loop until all data - * has been given, after which the reader only grabs the given data and puts - * them back into the UI strings. - * - * All method functions take a UI as argument. Additionally, the writer and - * the reader take a UI_STRING. - */ - -/* - * The UI_STRING type is the data structure that contains all the needed info - * about a string or a prompt, including test data for a verification prompt. - */ -typedef struct ui_string_st UI_STRING; -DECLARE_STACK_OF(UI_STRING) - -/* - * The different types of strings that are currently supported. - * This is only needed by method authors. - */ -enum UI_string_types { - UIT_NONE = 0, - UIT_PROMPT, /* Prompt for a string */ - UIT_VERIFY, /* Prompt for a string and verify */ - UIT_BOOLEAN, /* Prompt for a yes/no response */ - UIT_INFO, /* Send info to the user */ - UIT_ERROR /* Send an error message to the user */ -}; - -/* Create and manipulate methods */ -UI_METHOD *UI_create_method(const char *name); -void UI_destroy_method(UI_METHOD *ui_method); -int UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui)); -int UI_method_set_writer(UI_METHOD *method, - int (*writer)(UI *ui, UI_STRING *uis)); -int UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui)); -int UI_method_set_reader(UI_METHOD *method, - int (*reader)(UI *ui, UI_STRING *uis)); -int UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)); -int UI_method_set_prompt_constructor(UI_METHOD *method, - char *(*prompt_constructor)(UI *ui, const char *object_desc, - const char *object_name)); -int (*UI_method_get_opener(const UI_METHOD *method))(UI *); -int (*UI_method_get_writer(const UI_METHOD *method))(UI *, UI_STRING *); -int (*UI_method_get_flusher(const UI_METHOD *method))(UI *); -int (*UI_method_get_reader(const UI_METHOD *method))(UI *, UI_STRING *); -int (*UI_method_get_closer(const UI_METHOD *method))(UI *); -char *(*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI *, - const char *, const char *); - -/* - * The following functions are helpers for method writers to access relevant - * data from a UI_STRING. - */ -/* Return type of the UI_STRING */ -enum UI_string_types UI_get_string_type(UI_STRING *uis); -/* Return input flags of the UI_STRING */ -int UI_get_input_flags(UI_STRING *uis); -/* Return the actual string to output (the prompt, info or error) */ -const char *UI_get0_output_string(UI_STRING *uis); -/* Return the optional action string to output (boolean prompt instruction) */ -const char *UI_get0_action_string(UI_STRING *uis); -/* Return the result of a prompt */ -const char *UI_get0_result_string(UI_STRING *uis); -/* Return the string to test the result against. Only useful with verifies. */ -const char *UI_get0_test_string(UI_STRING *uis); -/* Return the required minimum size of the result */ -int UI_get_result_minsize(UI_STRING *uis); -/* Return the required maximum size of the result */ -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); - -void ERR_load_UI_strings(void); - -/* Error codes for the UI functions. */ - -/* Function codes. */ -#define UI_F_GENERAL_ALLOCATE_BOOLEAN 108 -#define UI_F_GENERAL_ALLOCATE_PROMPT 109 -#define UI_F_GENERAL_ALLOCATE_STRING 100 -#define UI_F_UI_CTRL 111 -#define UI_F_UI_DUP_ERROR_STRING 101 -#define UI_F_UI_DUP_INFO_STRING 102 -#define UI_F_UI_DUP_INPUT_BOOLEAN 110 -#define UI_F_UI_DUP_INPUT_STRING 103 -#define UI_F_UI_DUP_VERIFY_STRING 106 -#define UI_F_UI_GET0_RESULT 107 -#define UI_F_UI_NEW_METHOD 104 -#define UI_F_UI_SET_RESULT 105 - -/* Reason codes. */ -#define UI_R_COMMON_OK_AND_CANCEL_CHARACTERS 104 -#define UI_R_INDEX_TOO_LARGE 102 -#define UI_R_INDEX_TOO_SMALL 103 -#define UI_R_NO_RESULT_BUFFER 105 -#define UI_R_RESULT_TOO_LARGE 100 -#define UI_R_RESULT_TOO_SMALL 101 -#define UI_R_UNKNOWN_CONTROL_COMMAND 106 - -#ifdef __cplusplus -} -#endif -#endif diff --git a/src/lib/libcrypto/ui/ui_err.c b/src/lib/libcrypto/ui/ui_err.c deleted file mode 100644 index 656fa42887..0000000000 --- a/src/lib/libcrypto/ui/ui_err.c +++ /dev/null @@ -1,98 +0,0 @@ -/* $OpenBSD: ui_err.c,v 1.13 2024/06/24 06:43:23 tb Exp $ */ -/* ==================================================================== - * Copyright (c) 1999-2006 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 -#include - -#include "err_local.h" - -#ifndef OPENSSL_NO_ERR - -#define ERR_FUNC(func) ERR_PACK(ERR_LIB_UI,func,0) -#define ERR_REASON(reason) ERR_PACK(ERR_LIB_UI,0,reason) - -static const ERR_STRING_DATA UI_str_functs[] = { - {ERR_FUNC(0xfff), "CRYPTO_internal"}, - {0, NULL} -}; - -static const ERR_STRING_DATA UI_str_reasons[] = { - {ERR_REASON(UI_R_COMMON_OK_AND_CANCEL_CHARACTERS), "common ok and cancel characters"}, - {ERR_REASON(UI_R_INDEX_TOO_LARGE), "index too large"}, - {ERR_REASON(UI_R_INDEX_TOO_SMALL), "index too small"}, - {ERR_REASON(UI_R_NO_RESULT_BUFFER), "no result buffer"}, - {ERR_REASON(UI_R_RESULT_TOO_LARGE), "result too large"}, - {ERR_REASON(UI_R_RESULT_TOO_SMALL), "result too small"}, - {ERR_REASON(UI_R_UNKNOWN_CONTROL_COMMAND), "unknown control command"}, - {0, NULL} -}; - -#endif - -void -ERR_load_UI_strings(void) -{ -#ifndef OPENSSL_NO_ERR - if (ERR_func_error_string(UI_str_functs[0].error) == NULL) { - ERR_load_const_strings(UI_str_functs); - ERR_load_const_strings(UI_str_reasons); - } -#endif -} -LCRYPTO_ALIAS(ERR_load_UI_strings); diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c deleted file mode 100644 index 73d899afcc..0000000000 --- a/src/lib/libcrypto/ui/ui_lib.c +++ /dev/null @@ -1,907 +0,0 @@ -/* $OpenBSD: ui_lib.c,v 1.51 2023/02/16 08:38:17 tb Exp $ */ -/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL - * project 2001. - */ -/* ==================================================================== - * Copyright (c) 2001 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 -#include -#include - -#include "ui_local.h" - -static const UI_METHOD *default_UI_meth = NULL; - -UI * -UI_new(void) -{ - return (UI_new_method(NULL)); -} -LCRYPTO_ALIAS(UI_new); - -UI * -UI_new_method(const UI_METHOD *method) -{ - UI *ret; - - if ((ret = calloc(1, sizeof(UI))) == NULL) { - UIerror(ERR_R_MALLOC_FAILURE); - return NULL; - } - if ((ret->meth = method) == NULL) - ret->meth = UI_get_default_method(); - CRYPTO_new_ex_data(CRYPTO_EX_INDEX_UI, ret, &ret->ex_data); - - return ret; -} -LCRYPTO_ALIAS(UI_new_method); - -static void -free_string(UI_STRING *uis) -{ - if (uis == NULL) - return; - if (uis->flags & OUT_STRING_FREEABLE) { - free((char *) uis->out_string); - switch (uis->type) { - case UIT_BOOLEAN: - free((char *)uis->_.boolean_data.action_desc); - free((char *)uis->_.boolean_data.ok_chars); - free((char *)uis->_.boolean_data.cancel_chars); - break; - default: - break; - } - } - free(uis); -} - -void -UI_free(UI *ui) -{ - if (ui == NULL) - return; - - sk_UI_STRING_pop_free(ui->strings, free_string); - CRYPTO_free_ex_data(CRYPTO_EX_INDEX_UI, ui, &ui->ex_data); - free(ui); -} -LCRYPTO_ALIAS(UI_free); - -static int -allocate_string_stack(UI *ui) -{ - if (ui->strings == NULL) { - if ((ui->strings = sk_UI_STRING_new_null()) == NULL) { - UIerror(ERR_R_MALLOC_FAILURE); - return -1; - } - } - return 0; -} - -static UI_STRING * -general_allocate_prompt(const char *prompt, int dup_prompt, - enum UI_string_types type, int input_flags, char *result_buf) -{ - UI_STRING *uis = NULL; - - if (prompt == NULL) { - UIerror(ERR_R_PASSED_NULL_PARAMETER); - goto err; - } - if ((type == UIT_PROMPT || type == UIT_VERIFY || type == UIT_BOOLEAN) && - result_buf == NULL) { - UIerror(UI_R_NO_RESULT_BUFFER); - goto err; - } - - if ((uis = calloc(1, sizeof(UI_STRING))) == NULL) { - UIerror(ERR_R_MALLOC_FAILURE); - goto err; - } - uis->out_string = prompt; - if (dup_prompt) { - if ((uis->out_string = strdup(prompt)) == NULL) { - UIerror(ERR_R_MALLOC_FAILURE); - goto err; - } - uis->flags = OUT_STRING_FREEABLE; - } - uis->input_flags = input_flags; - uis->type = type; - uis->result_buf = result_buf; - - return uis; - - err: - free_string(uis); - return NULL; -} - -static int -general_allocate_string(UI *ui, const char *prompt, int dup_prompt, - enum UI_string_types type, int input_flags, char *result_buf, int minsize, - int maxsize, const char *test_buf) -{ - UI_STRING *s; - int ret; - - if ((s = general_allocate_prompt(prompt, dup_prompt, type, input_flags, - result_buf)) == NULL) - goto err; - s->_.string_data.result_minsize = minsize; - s->_.string_data.result_maxsize = maxsize; - s->_.string_data.test_buf = test_buf; - - if (allocate_string_stack(ui) < 0) - goto err; - if ((ret = sk_UI_STRING_push(ui->strings, s)) <= 0) - goto err; - - return ret; - - err: - free_string(s); - return -1; -} - -static int -general_allocate_boolean(UI *ui, const char *prompt, const char *action_desc, - const char *ok_chars, const char *cancel_chars, int dup_strings, - enum UI_string_types type, int input_flags, char *result_buf) -{ - UI_STRING *s = NULL; - int ret; - - if (ok_chars == NULL || cancel_chars == NULL) { - UIerror(ERR_R_PASSED_NULL_PARAMETER); - goto err; - } - if (ok_chars[strcspn(ok_chars, cancel_chars)] != '\0') { - UIerror(UI_R_COMMON_OK_AND_CANCEL_CHARACTERS); - goto err; - } - - if ((s = general_allocate_prompt(prompt, dup_strings, type, input_flags, - result_buf)) == NULL) - goto err; - - if (dup_strings) { - if (action_desc != NULL) { - if ((s->_.boolean_data.action_desc = - strdup(action_desc)) == NULL) { - UIerror(ERR_R_MALLOC_FAILURE); - goto err; - } - } - if ((s->_.boolean_data.ok_chars = strdup(ok_chars)) == NULL) { - UIerror(ERR_R_MALLOC_FAILURE); - goto err; - } - if ((s->_.boolean_data.cancel_chars = strdup(cancel_chars)) == - NULL) { - UIerror(ERR_R_MALLOC_FAILURE); - goto err; - } - } else { - s->_.boolean_data.action_desc = action_desc; - s->_.boolean_data.ok_chars = ok_chars; - s->_.boolean_data.cancel_chars = cancel_chars; - } - - if (allocate_string_stack(ui) < 0) - goto err; - if ((ret = sk_UI_STRING_push(ui->strings, s)) <= 0) - goto err; - - return ret; - - err: - free_string(s); - return -1; -} - -/* - * Returns the index to the place in the stack or -1 for error. Uses a - * direct reference to the prompt. - */ -int -UI_add_input_string(UI *ui, const char *prompt, int flags, char *result_buf, - int minsize, int maxsize) -{ - return general_allocate_string(ui, prompt, 0, UIT_PROMPT, flags, - result_buf, minsize, maxsize, NULL); -} -LCRYPTO_ALIAS(UI_add_input_string); - -/* Same as UI_add_input_string(), excepts it takes a copy of the prompt. */ -int -UI_dup_input_string(UI *ui, const char *prompt, int flags, char *result_buf, - int minsize, int maxsize) -{ - return general_allocate_string(ui, prompt, 1, UIT_PROMPT, flags, - result_buf, minsize, maxsize, NULL); -} -LCRYPTO_ALIAS(UI_dup_input_string); - -int -UI_add_verify_string(UI *ui, const char *prompt, int flags, char *result_buf, - int minsize, int maxsize, const char *test_buf) -{ - return general_allocate_string(ui, prompt, 0, UIT_VERIFY, flags, - result_buf, minsize, maxsize, test_buf); -} -LCRYPTO_ALIAS(UI_add_verify_string); - -int -UI_dup_verify_string(UI *ui, const char *prompt, int flags, - char *result_buf, int minsize, int maxsize, const char *test_buf) -{ - return general_allocate_string(ui, prompt, 1, UIT_VERIFY, flags, - result_buf, minsize, maxsize, test_buf); -} -LCRYPTO_ALIAS(UI_dup_verify_string); - -int -UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc, - const char *ok_chars, const char *cancel_chars, int flags, char *result_buf) -{ - return general_allocate_boolean(ui, prompt, action_desc, ok_chars, - cancel_chars, 0, UIT_BOOLEAN, flags, result_buf); -} -LCRYPTO_ALIAS(UI_add_input_boolean); - -int -UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc, - const char *ok_chars, const char *cancel_chars, int flags, char *result_buf) -{ - return general_allocate_boolean(ui, prompt, action_desc, ok_chars, - cancel_chars, 1, UIT_BOOLEAN, flags, result_buf); -} -LCRYPTO_ALIAS(UI_dup_input_boolean); - -int -UI_add_info_string(UI *ui, const char *text) -{ - return general_allocate_string(ui, text, 0, UIT_INFO, 0, NULL, 0, 0, - NULL); -} -LCRYPTO_ALIAS(UI_add_info_string); - -int -UI_dup_info_string(UI *ui, const char *text) -{ - return general_allocate_string(ui, text, 1, UIT_INFO, 0, NULL, 0, 0, - NULL); -} -LCRYPTO_ALIAS(UI_dup_info_string); - -int -UI_add_error_string(UI *ui, const char *text) -{ - return general_allocate_string(ui, text, 0, UIT_ERROR, 0, NULL, 0, 0, - NULL); -} -LCRYPTO_ALIAS(UI_add_error_string); - -int -UI_dup_error_string(UI *ui, const char *text) -{ - return general_allocate_string(ui, text, 1, UIT_ERROR, 0, NULL, 0, 0, - NULL); -} -LCRYPTO_ALIAS(UI_dup_error_string); - -char * -UI_construct_prompt(UI *ui, const char *object_desc, const char *object_name) -{ - char *prompt; - - if (ui->meth->ui_construct_prompt) - return ui->meth->ui_construct_prompt(ui, object_desc, - object_name); - - if (object_desc == NULL) - return NULL; - - if (object_name == NULL) { - if (asprintf(&prompt, "Enter %s:", object_desc) == -1) - return (NULL); - } else { - if (asprintf(&prompt, "Enter %s for %s:", object_desc, - object_name) == -1) - return (NULL); - } - - return prompt; -} -LCRYPTO_ALIAS(UI_construct_prompt); - -void * -UI_add_user_data(UI *ui, void *user_data) -{ - void *old_data = ui->user_data; - - ui->user_data = user_data; - - return old_data; -} -LCRYPTO_ALIAS(UI_add_user_data); - -void * -UI_get0_user_data(UI *ui) -{ - return ui->user_data; -} -LCRYPTO_ALIAS(UI_get0_user_data); - -const char * -UI_get0_result(UI *ui, int i) -{ - if (i < 0) { - UIerror(UI_R_INDEX_TOO_SMALL); - return NULL; - } - if (i >= sk_UI_STRING_num(ui->strings)) { - UIerror(UI_R_INDEX_TOO_LARGE); - return NULL; - } - return UI_get0_result_string(sk_UI_STRING_value(ui->strings, i)); -} -LCRYPTO_ALIAS(UI_get0_result); - -static int -print_error(const char *str, size_t len, void *arg) -{ - UI *ui = arg; - UI_STRING uis; - - memset(&uis, 0, sizeof(uis)); - uis.type = UIT_ERROR; - uis.out_string = str; - - if (ui->meth->ui_write_string && - !ui->meth->ui_write_string(ui, &uis)) - return -1; - return 0; -} - -int -UI_process(UI *ui) -{ - int i, ok = 0; - - if (ui->meth->ui_open_session && !ui->meth->ui_open_session(ui)) - return -1; - - if (ui->flags & UI_FLAG_PRINT_ERRORS) - ERR_print_errors_cb(print_error, ui); - - for (i = 0; i < sk_UI_STRING_num(ui->strings); i++) { - if (ui->meth->ui_write_string && - !ui->meth->ui_write_string(ui, - sk_UI_STRING_value(ui->strings, i))) { - ok = -1; - goto err; - } - } - - if (ui->meth->ui_flush) - switch (ui->meth->ui_flush(ui)) { - case -1: /* Interrupt/Cancel/something... */ - ok = -2; - goto err; - case 0: /* Errors */ - ok = -1; - goto err; - default: /* Success */ - ok = 0; - break; - } - - for (i = 0; i < sk_UI_STRING_num(ui->strings); i++) { - if (ui->meth->ui_read_string) { - switch (ui->meth->ui_read_string(ui, - sk_UI_STRING_value(ui->strings, i))) { - case -1: /* Interrupt/Cancel/something... */ - ui->flags &= ~UI_FLAG_REDOABLE; - ok = -2; - goto err; - case 0: /* Errors */ - ok = -1; - goto err; - default: /* Success */ - ok = 0; - break; - } - } - } - - err: - if (ui->meth->ui_close_session && !ui->meth->ui_close_session(ui)) - return -1; - return ok; -} -LCRYPTO_ALIAS(UI_process); - -int -UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void)) -{ - if (ui == NULL) { - UIerror(ERR_R_PASSED_NULL_PARAMETER); - return -1; - } - - switch (cmd) { - case UI_CTRL_PRINT_ERRORS: - { - int save_flag = !!(ui->flags & UI_FLAG_PRINT_ERRORS); - if (i) - ui->flags |= UI_FLAG_PRINT_ERRORS; - else - ui->flags &= ~UI_FLAG_PRINT_ERRORS; - return save_flag; - } - case UI_CTRL_IS_REDOABLE: - return !!(ui->flags & UI_FLAG_REDOABLE); - default: - break; - } - UIerror(UI_R_UNKNOWN_CONTROL_COMMAND); - return -1; -} -LCRYPTO_ALIAS(UI_ctrl); - -int -UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, - CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) -{ - return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI, argl, argp, - new_func, dup_func, free_func); -} -LCRYPTO_ALIAS(UI_get_ex_new_index); - -int -UI_set_ex_data(UI *r, int idx, void *arg) -{ - return (CRYPTO_set_ex_data(&r->ex_data, idx, arg)); -} -LCRYPTO_ALIAS(UI_set_ex_data); - -void * -UI_get_ex_data(UI *r, int idx) -{ - return (CRYPTO_get_ex_data(&r->ex_data, idx)); -} -LCRYPTO_ALIAS(UI_get_ex_data); - -void -UI_set_default_method(const UI_METHOD *method) -{ - default_UI_meth = method; -} -LCRYPTO_ALIAS(UI_set_default_method); - -const UI_METHOD * -UI_get_default_method(void) -{ - if (default_UI_meth == NULL) - default_UI_meth = UI_OpenSSL(); - - return default_UI_meth; -} -LCRYPTO_ALIAS(UI_get_default_method); - -const UI_METHOD * -UI_get_method(UI *ui) -{ - return ui->meth; -} -LCRYPTO_ALIAS(UI_get_method); - -const UI_METHOD * -UI_set_method(UI *ui, const UI_METHOD *method) -{ - ui->meth = method; - - return ui->meth; -} -LCRYPTO_ALIAS(UI_set_method); - -UI_METHOD * -UI_create_method(const char *name) -{ - UI_METHOD *method = NULL; - - if ((method = calloc(1, sizeof(UI_METHOD))) == NULL) - goto err; - - if (name != NULL) { - if ((method->name = strdup(name)) == NULL) - goto err; - } - - return method; - - err: - UI_destroy_method(method); - - return NULL; -} -LCRYPTO_ALIAS(UI_create_method); - -void -UI_destroy_method(UI_METHOD *method) -{ - if (method == NULL) - return; - - free(method->name); - free(method); -} -LCRYPTO_ALIAS(UI_destroy_method); - -int -UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui)) -{ - if (method == NULL) - return -1; - - method->ui_open_session = opener; - - return 0; -} -LCRYPTO_ALIAS(UI_method_set_opener); - -int -UI_method_set_writer(UI_METHOD *method, int (*writer)(UI *ui, UI_STRING *uis)) -{ - if (method == NULL) - return -1; - - method->ui_write_string = writer; - - return 0; -} -LCRYPTO_ALIAS(UI_method_set_writer); - -int -UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui)) -{ - if (method == NULL) - return -1; - - method->ui_flush = flusher; - - return 0; -} -LCRYPTO_ALIAS(UI_method_set_flusher); - -int -UI_method_set_reader(UI_METHOD *method, int (*reader)(UI *ui, UI_STRING *uis)) -{ - if (method == NULL) - return -1; - - method->ui_read_string = reader; - - return 0; -} -LCRYPTO_ALIAS(UI_method_set_reader); - -int -UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui)) -{ - if (method == NULL) - return -1; - - method->ui_close_session = closer; - - return 0; -} -LCRYPTO_ALIAS(UI_method_set_closer); - -int -UI_method_set_prompt_constructor(UI_METHOD *method, - char *(*prompt_constructor)(UI *ui, const char *object_desc, - const char *object_name)) -{ - if (method == NULL) - return -1; - - method->ui_construct_prompt = prompt_constructor; - - return 0; -} -LCRYPTO_ALIAS(UI_method_set_prompt_constructor); - -int -(*UI_method_get_opener(const UI_METHOD * method))(UI *) -{ - if (method == NULL) - return NULL; - - return method->ui_open_session; -} -LCRYPTO_ALIAS(UI_method_get_opener); - -int -(*UI_method_get_writer(const UI_METHOD *method))(UI *, UI_STRING *) -{ - if (method == NULL) - return NULL; - - return method->ui_write_string; -} -LCRYPTO_ALIAS(UI_method_get_writer); - -int -(*UI_method_get_flusher(const UI_METHOD *method)) (UI *) -{ - if (method == NULL) - return NULL; - - return method->ui_flush; -} -LCRYPTO_ALIAS(UI_method_get_flusher); - -int -(*UI_method_get_reader(const UI_METHOD *method))(UI *, UI_STRING *) -{ - if (method == NULL) - return NULL; - - return method->ui_read_string; -} -LCRYPTO_ALIAS(UI_method_get_reader); - -int -(*UI_method_get_closer(const UI_METHOD *method))(UI *) -{ - if (method == NULL) - return NULL; - - return method->ui_close_session; -} -LCRYPTO_ALIAS(UI_method_get_closer); - -char * -(*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI *, const char *, - const char *) -{ - if (method == NULL) - return NULL; - - return method->ui_construct_prompt; -} -LCRYPTO_ALIAS(UI_method_get_prompt_constructor); - -enum UI_string_types -UI_get_string_type(UI_STRING *uis) -{ - if (uis == NULL) - return UIT_NONE; - - return uis->type; -} -LCRYPTO_ALIAS(UI_get_string_type); - -int -UI_get_input_flags(UI_STRING *uis) -{ - if (uis == NULL) - return 0; - - return uis->input_flags; -} -LCRYPTO_ALIAS(UI_get_input_flags); - -const char * -UI_get0_output_string(UI_STRING *uis) -{ - if (uis == NULL) - return NULL; - - return uis->out_string; -} -LCRYPTO_ALIAS(UI_get0_output_string); - -const char * -UI_get0_action_string(UI_STRING *uis) -{ - if (uis == NULL) - return NULL; - - switch (uis->type) { - case UIT_PROMPT: - case UIT_BOOLEAN: - return uis->_.boolean_data.action_desc; - default: - return NULL; - } -} -LCRYPTO_ALIAS(UI_get0_action_string); - -const char * -UI_get0_result_string(UI_STRING *uis) -{ - if (uis == NULL) - return NULL; - - switch (uis->type) { - case UIT_PROMPT: - case UIT_VERIFY: - return uis->result_buf; - default: - return NULL; - } -} -LCRYPTO_ALIAS(UI_get0_result_string); - -const char * -UI_get0_test_string(UI_STRING *uis) -{ - if (uis == NULL) - return NULL; - - switch (uis->type) { - case UIT_VERIFY: - return uis->_.string_data.test_buf; - default: - return NULL; - } -} -LCRYPTO_ALIAS(UI_get0_test_string); - -int -UI_get_result_minsize(UI_STRING *uis) -{ - if (uis == NULL) - return -1; - - switch (uis->type) { - case UIT_PROMPT: - case UIT_VERIFY: - return uis->_.string_data.result_minsize; - default: - return -1; - } -} -LCRYPTO_ALIAS(UI_get_result_minsize); - -int -UI_get_result_maxsize(UI_STRING *uis) -{ - if (uis == NULL) - return -1; - - switch (uis->type) { - case UIT_PROMPT: - case UIT_VERIFY: - return uis->_.string_data.result_maxsize; - default: - return -1; - } -} -LCRYPTO_ALIAS(UI_get_result_maxsize); - -int -UI_set_result(UI *ui, UI_STRING *uis, const char *result) -{ - const char *p; - int l = strlen(result); - - ui->flags &= ~UI_FLAG_REDOABLE; - - if (uis == NULL) - return -1; - - switch (uis->type) { - case UIT_PROMPT: - case UIT_VERIFY: - if (l < uis->_.string_data.result_minsize) { - ui->flags |= UI_FLAG_REDOABLE; - UIerror(UI_R_RESULT_TOO_SMALL); - ERR_asprintf_error_data - ("You must type in %d to %d characters", - uis->_.string_data.result_minsize, - uis->_.string_data.result_maxsize); - return -1; - } - if (l > uis->_.string_data.result_maxsize) { - ui->flags |= UI_FLAG_REDOABLE; - UIerror(UI_R_RESULT_TOO_LARGE); - ERR_asprintf_error_data - ("You must type in %d to %d characters", - uis->_.string_data.result_minsize, - uis->_.string_data.result_maxsize); - return -1; - } - if (!uis->result_buf) { - UIerror(UI_R_NO_RESULT_BUFFER); - return -1; - } - strlcpy(uis->result_buf, result, - uis->_.string_data.result_maxsize + 1); - break; - case UIT_BOOLEAN: - if (!uis->result_buf) { - UIerror(UI_R_NO_RESULT_BUFFER); - return -1; - } - uis->result_buf[0] = '\0'; - for (p = result; *p; p++) { - if (strchr(uis->_.boolean_data.ok_chars, *p)) { - uis->result_buf[0] = - uis->_.boolean_data.ok_chars[0]; - break; - } - if (strchr(uis->_.boolean_data.cancel_chars, *p)) { - uis->result_buf[0] = - uis->_.boolean_data.cancel_chars[0]; - break; - } - } - default: - break; - } - return 0; -} -LCRYPTO_ALIAS(UI_set_result); diff --git a/src/lib/libcrypto/ui/ui_local.h b/src/lib/libcrypto/ui/ui_local.h deleted file mode 100644 index 460b5600bd..0000000000 --- a/src/lib/libcrypto/ui/ui_local.h +++ /dev/null @@ -1,152 +0,0 @@ -/* $OpenBSD: ui_local.h,v 1.2 2022/11/26 17:23:18 tb Exp $ */ - -/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL - * project 2001. - */ -/* ==================================================================== - * Copyright (c) 2001 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). - * - */ - -#ifndef HEADER_UI_LOCAL_H -#define HEADER_UI_LOCAL_H - -#include -#include - -__BEGIN_HIDDEN_DECLS - -#ifdef _ -#undef _ -#endif - -struct ui_method_st { - char *name; - - /* All the functions return 1 or non-NULL for success and 0 or NULL - for failure */ - - /* Open whatever channel for this, be it the console, an X window - or whatever. - This function should use the ex_data structure to save - intermediate data. */ - int (*ui_open_session)(UI *ui); - - int (*ui_write_string)(UI *ui, UI_STRING *uis); - - /* Flush the output. If a GUI dialog box is used, this function can - be used to actually display it. */ - int (*ui_flush)(UI *ui); - - int (*ui_read_string)(UI *ui, UI_STRING *uis); - - int (*ui_close_session)(UI *ui); - - /* Construct a prompt in a user-defined manner. object_desc is a - textual short description of the object, for example "pass phrase", - and object_name is the name of the object (might be a card name or - a file name. - The returned string shall always be allocated on the heap with - malloc(), and need to be free'd with free(). */ - char *(*ui_construct_prompt)(UI *ui, const char *object_desc, - const char *object_name); -}; - -struct ui_string_st { - enum UI_string_types type; /* Input */ - const char *out_string; /* Input */ - int input_flags; /* Flags from the user */ - - /* The following parameters are completely irrelevant for UIT_INFO, - and can therefore be set to 0 or NULL */ - char *result_buf; /* Input and Output: If not NULL, user-defined - with size in result_maxsize. Otherwise, it - may be allocated by the UI routine, meaning - result_minsize is going to be overwritten.*/ - union { - struct { - int result_minsize; /* Input: minimum required - size of the result. - */ - int result_maxsize; /* Input: maximum permitted - size of the result */ - - const char *test_buf; /* Input: test string to verify - against */ - } string_data; - struct { - const char *action_desc; /* Input */ - const char *ok_chars; /* Input */ - const char *cancel_chars; /* Input */ - } boolean_data; - } _; - -#define OUT_STRING_FREEABLE 0x01 - int flags; /* flags for internal use */ -}; - -struct ui_st { - const UI_METHOD *meth; - STACK_OF(UI_STRING) *strings; /* We might want to prompt for more - than one thing at a time, and - with different echoing status. */ - void *user_data; - CRYPTO_EX_DATA ex_data; - -#define UI_FLAG_REDOABLE 0x0001 -#define UI_FLAG_PRINT_ERRORS 0x0100 - int flags; -}; - -__END_HIDDEN_DECLS - -#endif /* !HEADER_UI_LOCAL_H */ diff --git a/src/lib/libcrypto/ui/ui_null.c b/src/lib/libcrypto/ui/ui_null.c deleted file mode 100644 index cbc9a5025b..0000000000 --- a/src/lib/libcrypto/ui/ui_null.c +++ /dev/null @@ -1,18 +0,0 @@ -/* $OpenBSD: ui_null.c,v 1.2 2023/02/16 08:38:17 tb Exp $ */ - -/* - * Written by Theo Buehler. Public domain. - */ - -#include "ui_local.h" - -static const UI_METHOD ui_null = { - .name = "OpenSSL NULL UI", -}; - -const UI_METHOD * -UI_null(void) -{ - return &ui_null; -} -LCRYPTO_ALIAS(UI_null); diff --git a/src/lib/libcrypto/ui/ui_openssl.c b/src/lib/libcrypto/ui/ui_openssl.c deleted file mode 100644 index 3ace3a4e75..0000000000 --- a/src/lib/libcrypto/ui/ui_openssl.c +++ /dev/null @@ -1,398 +0,0 @@ -/* $OpenBSD: ui_openssl.c,v 1.29 2025/03/09 15:25:53 tb Exp $ */ -/* Written by Richard Levitte (richard@levitte.org) and others - * for the OpenSSL project 2001. - */ -/* ==================================================================== - * Copyright (c) 2001 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). - * - */ - -/* The lowest level part of this file was previously in crypto/des/read_pwd.c, - * Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay@cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh@cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * 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 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 acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay@cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS 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 AUTHOR OR 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. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - -#include - -#include - -#include -#include -#include -#include -#include -#include - -#include "ui_local.h" - -#ifndef NX509_SIG -#define NX509_SIG 32 -#endif - -/* Define globals. They are protected by a lock */ -static struct sigaction savsig[NX509_SIG]; - -static struct termios tty_orig; -static FILE *tty_in, *tty_out; -static int is_a_tty; - -/* Declare static functions */ -static int read_till_nl(FILE *); -static void recsig(int); -static void pushsig(void); -static void popsig(void); -static int read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl); - -static int read_string(UI *ui, UI_STRING *uis); -static int write_string(UI *ui, UI_STRING *uis); - -static int open_console(UI *ui); -static int echo_console(UI *ui); -static int noecho_console(UI *ui); -static int close_console(UI *ui); - -static const UI_METHOD ui_openssl = { - .name = "OpenSSL default user interface", - .ui_open_session = open_console, - .ui_write_string = write_string, - .ui_read_string = read_string, - .ui_close_session = close_console, -}; - -/* The method with all the built-in thingies */ -const UI_METHOD * -UI_OpenSSL(void) -{ - return &ui_openssl; -} -LCRYPTO_ALIAS(UI_OpenSSL); - -/* The following function makes sure that info and error strings are printed - before any prompt. */ -static int -write_string(UI *ui, UI_STRING *uis) -{ - switch (UI_get_string_type(uis)) { - case UIT_ERROR: - case UIT_INFO: - fputs(UI_get0_output_string(uis), tty_out); - fflush(tty_out); - break; - default: - break; - } - return 1; -} - -static int -read_string(UI *ui, UI_STRING *uis) -{ - int ok = 0; - - switch (UI_get_string_type(uis)) { - case UIT_BOOLEAN: - fputs(UI_get0_output_string(uis), tty_out); - fputs(UI_get0_action_string(uis), tty_out); - fflush(tty_out); - return read_string_inner(ui, uis, - UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO, 0); - case UIT_PROMPT: - fputs(UI_get0_output_string(uis), tty_out); - fflush(tty_out); - return read_string_inner(ui, uis, - UI_get_input_flags(uis) & UI_INPUT_FLAG_ECHO, 1); - case UIT_VERIFY: - fprintf(tty_out, "Verifying - %s", - UI_get0_output_string(uis)); - fflush(tty_out); - if ((ok = read_string_inner(ui, uis, UI_get_input_flags(uis) & - UI_INPUT_FLAG_ECHO, 1)) <= 0) - return ok; - if (strcmp(UI_get0_result_string(uis), - UI_get0_test_string(uis)) != 0) { - fprintf(tty_out, "Verify failure\n"); - fflush(tty_out); - return 0; - } - break; - default: - break; - } - return 1; -} - - -/* Internal functions to read a string without echoing */ -static int -read_till_nl(FILE *in) -{ -#define SIZE 4 - char buf[SIZE + 1]; - - do { - if (!fgets(buf, SIZE, in)) - return 0; - } while (strchr(buf, '\n') == NULL); - return 1; -} - -static volatile sig_atomic_t intr_signal; - -static int -read_string_inner(UI *ui, UI_STRING *uis, int echo, int strip_nl) -{ - static int ps; - int ok; - char result[BUFSIZ]; - int maxsize = BUFSIZ - 1; - char *p; - - intr_signal = 0; - ok = 0; - ps = 0; - - pushsig(); - ps = 1; - - if (!echo && !noecho_console(ui)) - goto error; - ps = 2; - - result[0] = '\0'; - p = fgets(result, maxsize, tty_in); - if (!p) - goto error; - if (feof(tty_in)) - goto error; - if (ferror(tty_in)) - goto error; - if ((p = strchr(result, '\n')) != NULL) { - if (strip_nl) - *p = '\0'; - } else if (!read_till_nl(tty_in)) - goto error; - if (UI_set_result(ui, uis, result) >= 0) - ok = 1; - -error: - if (intr_signal == SIGINT) - ok = -1; - if (!echo) - fprintf(tty_out, "\n"); - if (ps >= 2 && !echo && !echo_console(ui)) - ok = 0; - - if (ps >= 1) - popsig(); - - explicit_bzero(result, BUFSIZ); - return ok; -} - - -/* Internal functions to open, handle and close a channel to the console. */ -static int -open_console(UI *ui) -{ - CRYPTO_w_lock(CRYPTO_LOCK_UI); - is_a_tty = 1; - -#define DEV_TTY "/dev/tty" - if ((tty_in = fopen(DEV_TTY, "r")) == NULL) - tty_in = stdin; - if ((tty_out = fopen(DEV_TTY, "w")) == NULL) - tty_out = stderr; - - if (tcgetattr(fileno(tty_in), &tty_orig) == -1) { - if (errno == ENOTTY) - is_a_tty = 0; - else - /* - * Ariel Glenn ariel@columbia.edu reports that - * solaris can return EINVAL instead. This should be - * ok - */ - if (errno == EINVAL) - is_a_tty = 0; - else - return 0; - } - - return 1; -} - -static int -noecho_console(UI *ui) -{ - struct termios tty_new = tty_orig; - - tty_new.c_lflag &= ~ECHO; - if (is_a_tty && (tcsetattr(fileno(tty_in), TCSANOW, &tty_new) == -1)) - return 0; - return 1; -} - -static int -echo_console(UI *ui) -{ - if (is_a_tty && (tcsetattr(fileno(tty_in), TCSANOW, &tty_orig) == -1)) - return 0; - return 1; -} - -static int -close_console(UI *ui) -{ - if (tty_in != stdin) - fclose(tty_in); - if (tty_out != stderr) - fclose(tty_out); - CRYPTO_w_unlock(CRYPTO_LOCK_UI); - - return 1; -} - - -/* Internal functions to handle signals and act on them */ -static void -pushsig(void) -{ - int i; - struct sigaction sa; - - memset(&sa, 0, sizeof sa); - sa.sa_handler = recsig; - - for (i = 1; i < NX509_SIG; i++) { - if (i == SIGUSR1) - continue; - if (i == SIGUSR2) - continue; - if (i == SIGKILL) /* We can't make any action on that. */ - continue; - sigaction(i, &sa, &savsig[i]); - } - - signal(SIGWINCH, SIG_DFL); -} - -static void -popsig(void) -{ - int i; - for (i = 1; i < NX509_SIG; i++) { - if (i == SIGUSR1) - continue; - if (i == SIGUSR2) - continue; - sigaction(i, &savsig[i], NULL); - } -} - -static void -recsig(int i) -{ - intr_signal = i; -} -- cgit v1.2.3-55-g6feb