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

scd: Prefer application Geldkarte over DINSIG.

Browse Source 
* scd/app.c (select_application): Reorder application tests.
--

Although the DINSIG application is available on most German cards, it
is in reality not used.  Thus showing the Geldkarte application is
more desirable for a good user experience.

Conflicts:

	scd/app.c
This commit is contained in:
Werner Koch 2011-12-15 21:45:35 +01:00 committed by NIIBE Yutaka
parent 8b07012f60
commit d7fd48db18
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scd/app.c
View File

@ -381,11 +381,11 @@ select_application (ctrl_t ctrl, int slot, const char *name, app_t *r_app)
err = app_select_nks (app); err = app_select_nks (app);
if (err && is_app_allowed ("p15") && (!name || !strcmp (name, "p15"))) if (err && is_app_allowed ("p15") && (!name || !strcmp (name, "p15")))
err = app_select_p15 (app); err = app_select_p15 (app);
if (err && is_app_allowed ("dinsig") && (!name || !strcmp (name, "dinsig")))
err = app_select_dinsig (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 ("dinsig") && (!name || !strcmp (name, "dinsig")))
err = app_select_dinsig (app);
if (err && name) if (err && name)
err = gpg_error (GPG_ERR_NOT_SUPPORTED); err = gpg_error (GPG_ERR_NOT_SUPPORTED);
@ -419,8 +419,10 @@ get_supported_applications (void)
"openpgp", "openpgp",
"nks", "nks",
"p15", "p15",
"dinsig",
"geldkarte", "geldkarte",
"dinsig",
/* Note: "undefined" is not listed here because it needs special
treatment by the client. */
NULL NULL
}; };
int idx; int idx;