Skip to content

Used maximum password request tries. #1112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Used maximum password request tries. #1112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/rnp/fficli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ ffi_pass_callback_stdin(rnp_ffi_t ffi,
char buffer[MAX_PASSWORD_LENGTH];
bool ok = false;
cli_rnp_t *rnp = static_cast<cli_rnp_t *>(app_ctx);
int pswdtries = 1;

if (!ffi || !pgp_context) {
goto done;
Expand Down Expand Up @@ -286,9 +287,13 @@ ffi_pass_callback_stdin(rnp_ffi_t ffi,
goto done;
}
if (strcmp(buf, buffer) != 0) {
fputs("\nPasswords do not match!", rnp->userio_out);
// currently will loop forever
goto start;
fputs("\nPasswords do not match!\n", rnp->userio_out);
fflush(rnp->userio_out);
if (rnp->pswdtries > 0 && ++pswdtries > rnp->pswdtries) {
goto done;
} else {
goto start;
}
}
}
ok = true;
Expand Down
6 changes: 3 additions & 3 deletions src/rnp/rnpcfg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,10 +486,10 @@ rnp_cfg_get_pswdtries(const rnp_cfg_t *cfg)

numtries = rnp_cfg_getstr(cfg, CFG_NUMTRIES);

if ((numtries == NULL) || ((num = atoi(numtries)) <= 0)) {
return MAX_PASSWORD_ATTEMPTS;
} else if (strcmp(numtries, "unlimited")) {
if (numtries != NULL && !strcmp(numtries, "unlimited")) {
return INFINITE_ATTEMPTS;
} else if ((numtries == NULL) || ((num = atoi(numtries)) <= 0)) {
return MAX_PASSWORD_ATTEMPTS;
} else {
return num;
}
Expand Down