nik/whois
1
0
Fork 0
mirror of https://github.com/rfc1036/whois.git synced 2026-10-18 07:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkpasswd: support raw $salt$ prefixes

Browse Source 
If the salt provided to the program starts with '$' then it will be
passed straight to crypt(3) without any checks.
This commit is contained in:
Marco d'Itri 2019-12-31 02:36:51 +01:00
parent 38cab73d18
commit aea6650cfc
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkpasswd.1
View File

@ -16,8 +16,11 @@ libc function, using the given salt.
.BI \-\-salt= STRING
Use the
.I STRING
as salt. It must not contain prefixes such as
.IR $1$ .
as salt. If it begins with
.I $
then it will be passed straight to
.BR crypt (3)
without any checks.
.TP
.BR \-R ", "\c
.BI \-\-rounds= NUMBER

4
mkpasswd.c
View File

@ -282,7 +282,9 @@ int main(int argc, char *argv[])
else
rounds_str[0] = '\0';
if (salt_arg && salt_arg[0] != '\0') {
if (salt_arg && salt_arg[0] == '$')
salt = NOFAIL(strdup(salt_arg));
else if (salt_arg && salt_arg[0] != '\0') {
unsigned int c = strlen(salt_arg);
if (c < salt_minlen || c > salt_maxlen) {
if (salt_minlen == salt_maxlen)