projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the possibility to disable the UI module entirely
[openssl.git]
/
apps
/
passwd.c
diff --git
a/apps/passwd.c
b/apps/passwd.c
index c87369760cd01c3116afe14a7856dae2efc084c5..7ce40e058c4c2d30a090308cad376ddeda1c9ea4 100644
(file)
--- a/
apps/passwd.c
+++ b/
apps/passwd.c
@@
-100,7
+100,7
@@
int passwd_main(int argc, char **argv)
char *salt_malloc = NULL, *passwd_malloc = NULL, *prog;
OPTION_CHOICE o;
int in_stdin = 0, pw_source_defined = 0;
char *salt_malloc = NULL, *passwd_malloc = NULL, *prog;
OPTION_CHOICE o;
int in_stdin = 0, pw_source_defined = 0;
-# ifndef OPENSSL_NO_UI
+# ifndef OPENSSL_NO_UI
_CONSOLE
int in_noverify = 0;
# endif
int passed_salt = 0, quiet = 0, table = 0, reverse = 0;
int in_noverify = 0;
# endif
int passed_salt = 0, quiet = 0, table = 0, reverse = 0;
@@
-129,7
+129,7
@@
int passwd_main(int argc, char **argv)
pw_source_defined = 1;
break;
case OPT_NOVERIFY:
pw_source_defined = 1;
break;
case OPT_NOVERIFY:
-# ifndef OPENSSL_NO_UI
+# ifndef OPENSSL_NO_UI
_CONSOLE
in_noverify = 1;
# endif
break;
in_noverify = 1;
# endif
break;
@@
-246,7
+246,7
@@
int passwd_main(int argc, char **argv)
* avoid rot of not-frequently-used code.
*/
if (1) {
* avoid rot of not-frequently-used code.
*/
if (1) {
-# ifndef OPENSSL_NO_UI
+# ifndef OPENSSL_NO_UI
_CONSOLE
/* build a null-terminated list */
static char *passwds_static[2] = { NULL, NULL };
/* build a null-terminated list */
static char *passwds_static[2] = { NULL, NULL };