diff options
| author | Rich Salz <rsalz@akamai.com> | 2018-12-11 12:31:55 -0500 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-12-19 18:55:40 +0100 |
| commit | 229446dfae66aed32a738063c9062fea8e7049dc (patch) | |
| tree | 9422d403bdb5af2a96cf964fa780bd59d94c24d5 /apps/apps.h | |
| parent | ffd2df135a5d9f6d2627bd125f362298430fdc06 (diff) | |
Some code-cleanup/simplification in apps
Remove some casts on password callback by adding a wrapper function.
Remove level of indent by doing an early-return on failure.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7873)
Diffstat (limited to 'apps/apps.h')
| -rw-r--r-- | apps/apps.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/apps.h b/apps/apps.h index 04f078994b..460188df30 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -437,6 +437,8 @@ typedef struct pw_cb_data { const char *prompt_info; } PW_CB_DATA; +/* We need both wrap and the "real" function because libcrypto uses both. */ +int wrap_password_callback(char *buf, int bufsiz, int verify, void *cb_data); int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_data); int setup_ui_method(void); |