deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid passphrase-error-lock by old GnuPG.

Browse Source
This commit is contained in:
NIIBE Yutaka
2017-11-07 13:48:08 +09:00
parent 36ecf67694
commit 9d5834d47b
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/openpgp.c
View File

@@ -192,6 +192,12 @@ cmd_verify (void)
return;
}
if (gpg_do_read_simple (NR_DO_KDF) && len != 32)
{
GPG_CONDITION_NOT_SATISFIED ();
return;
}
/* This is real authentication. */
if (p2 == 0x81)
r = verify_pso_cds (pw, len);
@@ -299,6 +305,12 @@ cmd_change_password (void)
return;
}
if (gpg_do_read_simple (NR_DO_KDF) && len != 64)
{
GPG_CONDITION_NOT_SATISFIED ();
return;
}
if (who == BY_USER) /* PW1 */
{
const uint8_t *ks_pw1 = gpg_do_read_simple (NR_DO_KEYSTRING_PW1);
@@ -519,6 +531,12 @@ cmd_reset_user_password (void)
const uint8_t *ks_rc = gpg_do_read_simple (NR_DO_KEYSTRING_RC);
uint8_t old_ks[KEYSTRING_MD_SIZE];
if (gpg_do_read_simple (NR_DO_KDF) && len != 64)
{
GPG_CONDITION_NOT_SATISFIED ();
return;
}
if (gpg_pw_locked (PW_ERR_RC))
{
DEBUG_INFO ("blocked.\r\n");
@@ -583,6 +601,12 @@ cmd_reset_user_password (void)
return;
}
if (gpg_do_read_simple (NR_DO_KDF) && len != 32)
{
GPG_CONDITION_NOT_SATISFIED ();
return;
}
newpw_len = len;
newpw = pw;
random_get_salt (new_salt);