security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Use default PIN flag

This commit is contained in:
Werner Koch 2008-04-21 07:53:20 +00:00
parent 4896f5f47c
commit 6e17d90e09
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scd/ChangeLog
View File

@ -1,3 +1,7 @@
2008-04-21 Werner Koch <wk@g10code.com>
* app-openpgp.c (verify_a_chv): Make use of the default CHV flag.
2008-03-26 Werner Koch <wk@g10code.com> 2008-03-26 Werner Koch <wk@g10code.com>
* app-openpgp.c (verify_chv3): Support the keypad. * app-openpgp.c (verify_chv3): Support the keypad.

21
scd/app-openpgp.c
View File

@ -481,7 +481,7 @@ count_bits (const unsigned char *a, size_t len)
return n; return n;
} }
/* GnuPG makes special use of the login-data DO, this fucntion parses /* GnuPG makes special use of the login-data DO, this function parses
the login data to store the flags for later use. It may be called the login data to store the flags for later use. It may be called
at any time and should be called after changing the login-data DO. at any time and should be called after changing the login-data DO.
@ -1300,6 +1300,25 @@ verify_a_chv (app_t app,
*pinvalue = NULL; *pinvalue = NULL;
if (chvno == 2 && app->app_local->flags.def_chv2)
{
/* Special case for def_chv2 mechanism. */
if (opt.verbose)
log_info (_("using default PIN as %s\n"), "CHV2");
rc = iso7816_verify (app->slot, 0x82, "123456", 6);
if (rc)
{
/* Verification of CHV2 with the default PIN failed,
although the card pretends to have the default PIN set as
CHV2. We better disable the def_chv2 flag now. */
log_info (_("failed to use default PIN as %s: %s"
" - disabling further default use\n"),
"CHV2", gpg_strerror (rc));
app->app_local->flags.def_chv2 = 0;
}
return rc;
}
memset (&pininfo, 0, sizeof pininfo); memset (&pininfo, 0, sizeof pininfo);
pininfo.mode = 1; pininfo.mode = 1;
pininfo.minlen = minlen; pininfo.minlen = minlen;