diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-06-19 16:26:30 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-06-19 16:26:30 +0000 |
| commit | 2fe5adc36c005b83615ed61e96ea70c0628f42eb (patch) | |
| tree | 68468738e30b607e85864c462caf51738dd09005 /apps/apps.h | |
| parent | 839590f5761db68ee733a422648ab2ec8e0a4f14 (diff) | |
Change the common application routines to use a UI_METHOD for password
prompting, even when done through the callback.
Diffstat (limited to 'apps/apps.h')
| -rw-r--r-- | apps/apps.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/apps.h b/apps/apps.h index 7fbd41769b..7cf4bf135d 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -123,16 +123,18 @@ extern BIO *bio_err; # ifdef _O_BINARY # define apps_startup() \ _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ - OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines() + OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); \ + setup_ui_method(); # else # define apps_startup() \ _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \ - OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines() + OpenSSL_add_all_algorithms(); ENGINE_load_builtin_engines(); \ + setup_ui_method(); # endif # else # define apps_startup() \ do_pipe_sig(); OpenSSL_add_all_algorithms(); \ - ENGINE_load_builtin_engines() + ENGINE_load_builtin_engines(); setup_ui_method(); # endif #endif @@ -152,6 +154,8 @@ typedef struct pw_cb_data int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_data); +int setup_ui_method(); + int should_retry(int i); int args_from_file(char *file, int *argc, char **argv[]); int str2fmt(char *s); |