diff options
Diffstat (limited to 'usr/src/common/openssl/crypto/ui/ui.h')
| -rw-r--r-- | usr/src/common/openssl/crypto/ui/ui.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/usr/src/common/openssl/crypto/ui/ui.h b/usr/src/common/openssl/crypto/ui/ui.h index 735a2d988e..018296412b 100644 --- a/usr/src/common/openssl/crypto/ui/ui.h +++ b/usr/src/common/openssl/crypto/ui/ui.h @@ -59,25 +59,19 @@ #ifndef HEADER_UI_H #define HEADER_UI_H +#ifndef OPENSSL_NO_DEPRECATED #include <openssl/crypto.h> +#endif #include <openssl/safestack.h> +#include <openssl/ossl_typ.h> #ifdef __cplusplus extern "C" { #endif -/* The UI type is a holder for a specific user interface session. It can - contain an illimited number of informational or error strings as well - as things to prompt for, both passwords (noecho mode) and others (echo - mode), and verification of the same. All of these are called strings, - and are further described below. */ -typedef struct ui_st UI; - -/* All instances of UI have a reference to a method structure, which is a - ordered vector of functions that implement the lower level things to do. - There is an instruction on the implementation further down, in the section - for method implementors. */ -typedef struct ui_method_st UI_METHOD; +/* 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 @@ -217,7 +211,7 @@ 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)()); +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 |