diff options
| author | Ben Laurie <ben@openssl.org> | 2000-02-11 13:11:18 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2000-02-11 13:11:18 +0000 |
| commit | efb416299fee5d59ffb0290686d306dd061bab1d (patch) | |
| tree | 1eda9b0b404d9252d3d1dd690983517b41be81f9 /apps | |
| parent | f6814ea43ab9271b8c9ae460b2a460d728bb9277 (diff) | |
| download | openssl-new-efb416299fee5d59ffb0290686d306dd061bab1d.tar.gz | |
Fix shadow.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/passwd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/passwd.c b/apps/passwd.c index 4ba68159bc..c189d233f3 100644 --- a/apps/passwd.c +++ b/apps/passwd.c @@ -46,7 +46,7 @@ int MAIN(int argc, char **argv) BIO *out = NULL; int i, badopt, opt_done; int passed_salt = 0, quiet = 0, table = 0; - int crypt = 0; + int usecrypt = 0; size_t pw_maxlen = 0; apps_startup(); @@ -64,7 +64,7 @@ int MAIN(int argc, char **argv) while (!badopt && !opt_done && argv[++i] != NULL) { if (strcmp(argv[i], "-crypt") == 0) - crypt = 1; + usecrypt = 1; else if (strcmp(argv[i], "-salt") == 0) { if ((argv[i+1] != NULL) && (salt == NULL)) @@ -88,9 +88,9 @@ int MAIN(int argc, char **argv) } } - if (crypt /* + algo2 + algo3 + ... */ == 0) /* use default */ - crypt = 1; - if (crypt /* + algo2 + algo3 */ > 1) /* conflict */ + if (usecrypt /* + algo2 + algo3 + ... */ == 0) /* use default */ + usecrypt = 1; + if (usecrypt /* + algo2 + algo3 */ > 1) /* conflict */ badopt = 1; if (badopt) @@ -105,7 +105,7 @@ int MAIN(int argc, char **argv) goto err; } - if (crypt) + if (usecrypt) pw_maxlen = 8; /* else if ... */ @@ -131,7 +131,7 @@ int MAIN(int argc, char **argv) /* first make sure we have a salt */ if (!passed_salt) { - if (crypt) + if (usecrypt) { if (salt_malloc == NULL) { @@ -165,7 +165,7 @@ int MAIN(int argc, char **argv) assert(strlen(passwd) <= pw_maxlen); /* now compute password hash */ - if (crypt) + if (usecrypt) { char *hash = des_crypt(passwd, salt); if (table) |