emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

refactor get_salt function

Browse Source 
refactor get_salt function to make it easier to read.
This commit is contained in:
juyin 2022-04-01 09:26:29 +08:00 committed by Serge Hallyn
parent 3732cf72d6
commit 3c1e5fcf16
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/chpasswd.c
View File

@ -394,18 +394,19 @@ static void close_files (void)
static const char *get_salt(void) static const char *get_salt(void)
{ {
if ( !eflg
&& ( (NULL == crypt_method)
|| (0 != strcmp (crypt_method, "NONE")))) {
void *arg = NULL; void *arg = NULL;
if (eflg || ((NULL != crypt_method) && (0 == strcmp (crypt_method, "NONE")))) {
return NULL;
}
if (md5flg) { if (md5flg) {
crypt_method = "MD5"; crypt_method = "MD5";
} }
#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT) #if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) || defined(USE_YESCRYPT)
if (sflg) { if (sflg) {
#if defined(USE_SHA_CRYPT) #if defined(USE_SHA_CRYPT)
if ( (0 == strcmp (crypt_method, "SHA256")) if ((0 == strcmp (crypt_method, "SHA256"))
|| (0 == strcmp (crypt_method, "SHA512"))) { || (0 == strcmp (crypt_method, "SHA512"))) {
arg = &sha_rounds; arg = &sha_rounds;
} }
@ -423,9 +424,6 @@ static const char *get_salt(void)
} }
#endif #endif
return crypt_make_salt (crypt_method, arg); return crypt_make_salt (crypt_method, arg);
}
return NULL;
} }
int main (int argc, char **argv) int main (int argc, char **argv)