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: Skip S/N reading for the "undefined" application.

Browse Source 
* scd/app.c (select_application): Skip serial number reading.
This commit is contained in:
Werner Koch 2011-12-14 18:56:10 +01:00
parent 0bac31ee9f
commit 792e137ec7
1 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
scd/app.c
View File

@ -242,11 +242,14 @@ select_application (ctrl_t ctrl, int slot, const char *name, app_t *r_app)
app_t app = NULL; app_t app = NULL;
unsigned char *result = NULL; unsigned char *result = NULL;
size_t resultlen; size_t resultlen;
int want_undefined;
(void)ctrl; (void)ctrl;
*r_app = NULL; *r_app = NULL;
want_undefined = (name && !strcmp (name, "undefined"));
err = lock_reader (slot, ctrl); err = lock_reader (slot, ctrl);
if (err) if (err)
return err; return err;
@ -326,45 +329,49 @@ select_application (ctrl_t ctrl, int slot, const char *name, app_t *r_app)
/* Fixme: We should now first check whether a card is at all /* Fixme: We should now first check whether a card is at all
present. */ present. */
/* Try to read the GDO file first to get a default serial number. */ /* Try to read the GDO file first to get a default serial number.
err = iso7816_select_file (slot, 0x3F00, 1, NULL, NULL); We skip this if the undefined application has been requested. */
if (!err) if (!want_undefined)
err = iso7816_select_file (slot, 0x2F02, 0, NULL, NULL);
if (!err)
err = iso7816_read_binary (slot, 0, 0, &result, &resultlen);
if (!err)
{ {
size_t n; err = iso7816_select_file (slot, 0x3F00, 1, NULL, NULL);
const unsigned char *p; if (!err)
err = iso7816_select_file (slot, 0x2F02, 0, NULL, NULL);
p = find_tlv_unchecked (result, resultlen, 0x5A, &n); if (!err)
if (p) err = iso7816_read_binary (slot, 0, 0, &result, &resultlen);
resultlen -= (p-result); if (!err)
if (p && n > resultlen && n == 0x0d && resultlen+1 == n)
{ {
/* The object it does not fit into the buffer. This is an size_t n;
invalid encoding (or the buffer is too short. However, I const unsigned char *p;
have some test cards with such an invalid encoding and
therefore I use this ugly workaround to return something
I can further experiment with. */
log_info ("enabling BMI testcard workaround\n");
n--;
}
if (p && n <= resultlen) p = find_tlv_unchecked (result, resultlen, 0x5A, &n);
{ if (p)
/* The GDO file is pretty short, thus we simply reuse it for resultlen -= (p-result);
storing the serial number. */ if (p && n > resultlen && n == 0x0d && resultlen+1 == n)
memmove (result, p, n); {
app->serialno = result; /* The object it does not fit into the buffer. This is an
app->serialnolen = n; invalid encoding (or the buffer is too short. However, I
err = app_munge_serialno (app); have some test cards with such an invalid encoding and
if (err) therefore I use this ugly workaround to return something
goto leave; I can further experiment with. */
log_info ("enabling BMI testcard workaround\n");
n--;
}
if (p && n <= resultlen)
{
/* The GDO file is pretty short, thus we simply reuse it for
storing the serial number. */
memmove (result, p, n);
app->serialno = result;
app->serialnolen = n;
err = app_munge_serialno (app);
if (err)
goto leave;
}
else
xfree (result);
result = NULL;
} }
else
xfree (result);
result = NULL;
} }
/* For certain error codes, there is no need to try more. */ /* For certain error codes, there is no need to try more. */
@ -373,7 +380,15 @@ select_application (ctrl_t ctrl, int slot, const char *name, app_t *r_app)
goto leave; goto leave;
/* Figure out the application to use. */ /* Figure out the application to use. */
err = gpg_error (GPG_ERR_NOT_FOUND); if (want_undefined)
{
/* We switch to the "undefined" application only if explicitly
requested. */
app->apptype = "UNDEFINED";
err = 0;
}
else
err = gpg_error (GPG_ERR_NOT_FOUND);
if (err && is_app_allowed ("openpgp") if (err && is_app_allowed ("openpgp")
&& (!name || !strcmp (name, "openpgp"))) && (!name || !strcmp (name, "openpgp")))
@ -387,14 +402,6 @@ select_application (ctrl_t ctrl, int slot, const char *name, app_t *r_app)
if (err && is_app_allowed ("geldkarte") if (err && is_app_allowed ("geldkarte")
&& (!name || !strcmp (name, "geldkarte"))) && (!name || !strcmp (name, "geldkarte")))
err = app_select_geldkarte (app); err = app_select_geldkarte (app);
if (err && is_app_allowed ("undefined")
&& (name && !strcmp (name, "undefined")))
{
/* We switch to the "undefined" application only if explicitly
requested. */
app->apptype = "UNDEFINED";
err = 0;
}
if (err && name) if (err && name)
err = gpg_error (GPG_ERR_NOT_SUPPORTED); err = gpg_error (GPG_ERR_NOT_SUPPORTED);