security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-22 14:57:02 +01:00
Code Activity

scd:p15: Add pre-check for ascii-numeric PINs.

Browse Source 
* scd/app-p15.c (verify_pin): ascii-numeric is different than BCD.

(cherry picked from commit 029924a46e08ffcda038d89f06abfb41c980a9ad)
Added a few typo fixes.
This commit is contained in:
Werner Koch 2021-06-18 18:02:08 +02:00
parent 326f6fa166
commit 1915b95ffd
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scd/app-p15.c
View File

@ -326,7 +326,7 @@ struct prkdf_object_s
char *serial_number; char *serial_number;
/* KDF/KEK parameter for OpenPGP's ECDH. First byte is zero if not /* KDF/KEK parameter for OpenPGP's ECDH. First byte is zero if not
* availabale. .*/ * available. */
unsigned char ecdh_kdf[4]; unsigned char ecdh_kdf[4];
/* Length and allocated buffer with the Id of this object. */ /* Length and allocated buffer with the Id of this object. */
@ -4515,7 +4515,7 @@ send_key_fpr_line (ctrl_t ctrl, int number, const unsigned char *fpr)
} }
/* If possible Emit a FPR-KEY status line for the private key object /* If possible emit a FPR-KEY status line for the private key object
* PRKDF using NUMBER as index. */ * PRKDF using NUMBER as index. */
static void static void
send_key_fpr (app_t app, ctrl_t ctrl, prkdf_object_t prkdf, int number) send_key_fpr (app_t app, ctrl_t ctrl, prkdf_object_t prkdf, int number)
@ -5302,7 +5302,6 @@ verify_pin (app_t app,
switch (aodf->pintype) switch (aodf->pintype)
{ {
case PIN_TYPE_BCD: case PIN_TYPE_BCD:
case PIN_TYPE_ASCII_NUMERIC:
for (s=pinvalue; digitp (s); s++) for (s=pinvalue; digitp (s); s++)
; ;
if (*s) if (*s)
@ -5311,6 +5310,15 @@ verify_pin (app_t app,
err = gpg_error (GPG_ERR_BAD_PIN); err = gpg_error (GPG_ERR_BAD_PIN);
} }
break; break;
case PIN_TYPE_ASCII_NUMERIC:
for (s=pinvalue; *s && !(*s & 0x80); s++)
;
if (*s)
{
errstr = "Non-ascii characters found in PIN";
err = gpg_error (GPG_ERR_BAD_PIN);
}
break;
case PIN_TYPE_UTF8: case PIN_TYPE_UTF8:
break; break;
case PIN_TYPE_HALF_NIBBLE_BCD: case PIN_TYPE_HALF_NIBBLE_BCD: