mirror of
https://github.com/cathugger/mkp224o.git
synced 2025-02-02 22:07:05 -03:00
use "latest wins" logic for skipnear/warnnear args
This commit is contained in:
parent
c7a8d75229
commit
6c704d20c4
1 changed files with 6 additions and 4 deletions
10
main.c
10
main.c
|
@ -338,10 +338,14 @@ int main(int argc,char **argv)
|
||||||
else
|
else
|
||||||
e_additional();
|
e_additional();
|
||||||
}
|
}
|
||||||
else if (!strcmp(arg,"skipnear"))
|
else if (!strcmp(arg,"skipnear")) {
|
||||||
pw_skipnear = 1;
|
pw_skipnear = 1;
|
||||||
else if (!strcmp(arg,"warnnear"))
|
pw_warnnear = 0;
|
||||||
|
}
|
||||||
|
else if (!strcmp(arg,"warnnear")) {
|
||||||
pw_warnnear = 1;
|
pw_warnnear = 1;
|
||||||
|
pw_skipnear = 0;
|
||||||
|
}
|
||||||
#endif // PASSPHRASE
|
#endif // PASSPHRASE
|
||||||
else {
|
else {
|
||||||
fprintf(stderr,"unrecognised argument: --%s\n",arg);
|
fprintf(stderr,"unrecognised argument: --%s\n",arg);
|
||||||
|
@ -614,8 +618,6 @@ int main(int argc,char **argv)
|
||||||
"CAUTION: avoid using keys generated with the same password for unrelated\n"
|
"CAUTION: avoid using keys generated with the same password for unrelated\n"
|
||||||
" services, as single leaked key may help an attacker to regenerate\n"
|
" services, as single leaked key may help an attacker to regenerate\n"
|
||||||
" related keys; to silence this warning, pass --skipnear or --warnnear.\n");
|
" related keys; to silence this warning, pass --skipnear or --warnnear.\n");
|
||||||
if (pw_warnnear)
|
|
||||||
pw_skipnear = 0;
|
|
||||||
if (checkpointfile) {
|
if (checkpointfile) {
|
||||||
memcpy(orig_determseed,determseed,sizeof(determseed));
|
memcpy(orig_determseed,determseed,sizeof(determseed));
|
||||||
// Read current checkpoint position if file exists
|
// Read current checkpoint position if file exists
|
||||||
|
|
Loading…
Add table
Reference in a new issue