security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

scd:openpgp: Add the length check for new PIN.

Browse Source 
* scd/app-openpgp.c (do_change_pin): Make sure new PIN length
is longer than MINLEN.

--

GnuPG-bug-id: 6843
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
(cherry picked from commit 2376cdff1318688d94c95fd01adc4b2139c4a8c7)
This commit is contained in:
NIIBE Yutaka 2023-12-22 13:32:40 +09:00 committed by Werner Koch
parent 20e85585ed
commit efe325ffdf
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
scd/app-openpgp.c
View File

@ -3286,6 +3286,31 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr,
log_error (_("error getting new PIN: %s\n"), gpg_strerror (rc)); log_error (_("error getting new PIN: %s\n"), gpg_strerror (rc));
goto leave; goto leave;
} }
if (set_resetcode)
{
size_t bufferlen = strlen (pinvalue);
if (bufferlen != 0 && bufferlen < 8)
{
log_error (_("Reset Code is too short; minimum length is %d\n"), 8);
rc = gpg_error (GPG_ERR_BAD_RESET_CODE);
goto leave;
}
}
else
{
if (chvno == 3)
minlen = 8;
if (strlen (pinvalue) < minlen)
{
log_info (_("PIN for CHV%d is too short;"
" minimum length is %d\n"), chvno, minlen);
rc = gpg_error (GPG_ERR_BAD_PIN);
goto leave;
}
}
} }
@ -3320,22 +3345,15 @@ do_change_pin (app_t app, ctrl_t ctrl, const char *chvnostr,
} }
else if (set_resetcode) else if (set_resetcode)
{ {
size_t bufferlen = strlen (pinvalue); size_t bufferlen;
char *buffer = NULL; char *buffer = NULL;
if (bufferlen && bufferlen < 8) rc = pin2hash_if_kdf (app, 0, pinvalue, &buffer, &bufferlen);
{ if (!rc)
log_error (_("Reset Code is too short; minimum length is %d\n"), 8); rc = iso7816_put_data (app_get_slot (app),
rc = gpg_error (GPG_ERR_BAD_PIN); 0, 0xD3, buffer, bufferlen);
}
else wipe_and_free (buffer, bufferlen);
{
rc = pin2hash_if_kdf (app, 0, pinvalue, &buffer, &bufferlen);
if (!rc)
rc = iso7816_put_data (app_get_slot (app),
0, 0xD3, buffer, bufferlen);
wipe_and_free (buffer, bufferlen);
}
} }
else if (reset_mode) else if (reset_mode)
{ {