mirror/keepassxc
0
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-20 12:22:16 +02:00
Code

Fix shadowed variables in zxcvbn

Browse Source
This commit is contained in:
Jonathan White 2021-09-06 22:44:55 -04:00
parent 470129091a
commit e6798112be
No known key found for this signature in database
GPG Key ID: 440FC65F2E0C6E01
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/zxcvbn/zxcvbn.c
View File

@ -684,22 +684,22 @@ static void DoDictMatch(const uint8_t *Passwd, int Start, int MaxLen, DictWork_t
if (r) if (r)
{ {
/* valid conversion from leet */ /* valid conversion from leet */
DictWork_t w; DictWork_t wrk;
w = *Wrk; wrk = *Wrk;
w.StartLoc = NodeLoc; wrk.StartLoc = NodeLoc;
w.Ordinal = Ord; wrk.Ordinal = Ord;
w.PwdLength += Len; wrk.PwdLength += Len;
w.Caps = Caps; wrk.Caps = Caps;
w.Lower = Lower; wrk.Lower = Lower;
w.First = *r; wrk.First = *r;
w.NumPossChrs = NumPossChrs; wrk.NumPossChrs = NumPossChrs;
memcpy(w.PossChars, PossChars, sizeof w.PossChars); memcpy(wrk.PossChars, PossChars, sizeof wrk.PossChars);
if (j) if (j)
{ {
w.LeetCnv[i] = *r; wrk.LeetCnv[i] = *r;
AddLeetChr(*r, -1, w.Leeted, w.UnLeet); AddLeetChr(*r, -1, wrk.Leeted, wrk.UnLeet);
} }
DoDictMatch(Pwd, Passwd - Pwd, MaxLen - Len, &w, Result, Extra, Lev+1); DoDictMatch(Pwd, Passwd - Pwd, MaxLen - Len, &wrk, Result, Extra, Lev + 1);
} }
} }
return; return;
@ -1335,7 +1335,7 @@ static void DateMatch(ZxcMatch_t **Result, const uint8_t *Passwd, int Start, int
{ {
/* String matched the date, store result */ /* String matched the date, store result */
double e; double e;
ZxcMatch_t *p = AllocMatch(); ZxcMatch_t *match = AllocMatch();
if (Len <= 4) if (Len <= 4)
e = log(MAX_YEAR - MIN_YEAR + 1.0); e = log(MAX_YEAR - MIN_YEAR + 1.0);
@ -1345,12 +1345,12 @@ static void DateMatch(ZxcMatch_t **Result, const uint8_t *Passwd, int Start, int
e = log(31 * 12 * 100.0); e = log(31 * 12 * 100.0);
if (Sep) if (Sep)
e += log(4.0); /* Extra 2 bits for separator */ e += log(4.0); /* Extra 2 bits for separator */
p->Entrpy = e; match->Entrpy = e;
p->Type = DATE_MATCH; match->Type = DATE_MATCH;
p->Length = Len; match->Length = Len;
p->Begin = Start; match->Begin = Start;
AddMatchRepeats(Result, p, Passwd, MaxLen); AddMatchRepeats(Result, match, Passwd, MaxLen);
AddResult(Result, p, MaxLen); AddResult(Result, match, MaxLen);
PrevLen = Len; PrevLen = Len;
} }
} }
@ -1405,9 +1405,8 @@ static void RepeatMatch(ZxcMatch_t **Result, const uint8_t *Passwd, int Start, i
if (strncmp((const char *)Passwd, (const char *)Rpt, Len) == 0) if (strncmp((const char *)Passwd, (const char *)Rpt, Len) == 0)
{ {
/* Found a repeat */ /* Found a repeat */
int c = Cardinality(Passwd, Len);
ZxcMatch_t *p = AllocMatch(); ZxcMatch_t *p = AllocMatch();
p->Entrpy = log((double)c) * Len + log(RepeatCount); p->Entrpy = log((double)Cardinality(Passwd, Len)) * Len + log(RepeatCount);
p->Type = (ZxcTypeMatch_t)(BRUTE_MATCH + MULTIPLE_MATCH); p->Type = (ZxcTypeMatch_t)(BRUTE_MATCH + MULTIPLE_MATCH);
p->Length = Len * RepeatCount; p->Length = Len * RepeatCount;
p->Begin = Start; p->Begin = Start;
@ -1643,18 +1642,18 @@ double ZxcvbnMatch(const char *Pwd, const char *UserDict[], ZxcMatch_t **Info)
for(i = 0; i < Len; ++i) for(i = 0; i < Len; ++i)
{ {
int MaxLen = Len - i; int MaxLen = Len - i;
int j; int k;
if (!RevPwd[i]) if (!RevPwd[i])
continue; continue;
for(j = i+1; j <= Len; ++j) for(k = i + 1; k <= Len; ++k)
{ {
if (RevPwd[j]) if (RevPwd[k])
{ {
Zp = AllocMatch(); Zp = AllocMatch();
Zp->Type = BRUTE_MATCH; Zp->Type = BRUTE_MATCH;
Zp->Begin = i; Zp->Begin = i;
Zp->Length = j - i; Zp->Length = k - i;
Zp->Entrpy = e * (j - i); Zp->Entrpy = e * (k - i);
AddResult(&(Nodes[i].Paths), Zp, MaxLen); AddResult(&(Nodes[i].Paths), Zp, MaxLen);
} }
} }
@ -1667,15 +1666,15 @@ double ZxcvbnMatch(const char *Pwd, const char *UserDict[], ZxcMatch_t **Info)
/* Reduce the paths using Dijkstra's algorithm */ /* Reduce the paths using Dijkstra's algorithm */
for(i = 0; i < Len; ++i) for(i = 0; i < Len; ++i)
{ {
int j; int k;
double MinDist = DBL_MAX; double MinDist = DBL_MAX;
int MinIdx = 0; int MinIdx = 0;
/* Find the unvisited node with minimum distance or entropy */ /* Find the unvisited node with minimum distance or entropy */
for(Np = Nodes, j = 0; j < Len; ++j, ++Np) for(Np = Nodes, k = 0; k < Len; ++k, ++Np)
{ {
if (!Np->Visit && (Np->Dist < MinDist)) if (!Np->Visit && (Np->Dist < MinDist))
{ {
MinIdx = j; MinIdx = k;
MinDist = Np->Dist; MinDist = Np->Dist;
} }
} }