giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added boilerplate for disabling old card driver 

currently disabled:
- miocos
- jcop
This commit is contained in:
Frank Morgner 2017-10-18 11:52:48 +02:00
parent 4d5b73d869
commit eacb53fc60
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/opensc.conf.in
View File

@ -143,6 +143,9 @@ app default {
# from the output of:
# $ opensc-tool --list-drivers
#
# A special value of 'old' will load all
# statically linked drivers that may be removed in the future.
#
# A special value of 'internal' will load all
# statically linked drivers. If an unknown (ie. not
# internal) driver is supplied, a separate configuration
@ -150,7 +153,7 @@ app default {
# Default: internal
# NOTE: When "internal" keyword is used, must be last entry
#
card_drivers = npa, internal;
#card_drivers = old, internal;
# Card driver configuration blocks.

36
src/libopensc/ctx.c
View File

@ -76,11 +76,9 @@ static const struct _sc_driver_entry internal_card_drivers[] = {
{ "gpk", (void *(*)(void)) sc_get_gpk_driver },
#endif
{ "gemsafeV1", (void *(*)(void)) sc_get_gemsafeV1_driver },
{ "miocos", (void *(*)(void)) sc_get_miocos_driver },
{ "asepcos", (void *(*)(void)) sc_get_asepcos_driver },
{ "starcos", (void *(*)(void)) sc_get_starcos_driver },
{ "tcos", (void *(*)(void)) sc_get_tcos_driver },
{ "jcop", (void *(*)(void)) sc_get_jcop_driver },
#ifdef ENABLE_OPENSSL
{ "oberthur", (void *(*)(void)) sc_get_oberthur_driver },
{ "authentic", (void *(*)(void)) sc_get_authentic_driver },
@ -129,6 +127,12 @@ static const struct _sc_driver_entry internal_card_drivers[] = {
{ NULL, NULL }
};
static const struct _sc_driver_entry old_card_drivers[] = {
{ "miocos", (void *(*)(void)) sc_get_miocos_driver },
{ "jcop", (void *(*)(void)) sc_get_jcop_driver },
{ NULL, NULL }
};
struct _sc_ctx_options {
struct _sc_driver_entry cdrv[SC_MAX_CARD_DRIVERS];
int ccount;
@ -256,6 +260,19 @@ static void add_internal_drvs(struct _sc_ctx_options *opts)
}
}
static void add_old_drvs(struct _sc_ctx_options *opts)
{
const struct _sc_driver_entry *lst;
int i;
lst = old_card_drivers;
i = 0;
while (lst[i].name != NULL) {
add_drv(opts, lst[i].name);
i++;
}
}
static void set_defaults(sc_context_t *ctx, struct _sc_ctx_options *opts)
{
ctx->debug = 0;
@ -316,7 +333,7 @@ load_parameters(sc_context_t *ctx, scconf_block *block, struct _sc_ctx_options *
{
int err = 0;
const scconf_list *list;
const char *val, *s_internal = "internal";
const char *val, *s_internal = "internal", *s_old = "old";
int debug;
#ifdef _WIN32
char expanded_val[PATH_MAX];
@ -372,6 +389,8 @@ load_parameters(sc_context_t *ctx, scconf_block *block, struct _sc_ctx_options *
while (list != NULL) {
if (strcmp(list->data, s_internal) == 0)
add_internal_drvs(opts);
else if (strcmp(list->data, s_old) == 0)
add_old_drvs(opts);
else
add_drv(opts, list->data);
list = list->next;
@ -507,11 +526,20 @@ static int load_card_drivers(sc_context_t *ctx, struct _sc_ctx_options *opts)
}
ent = &opts->cdrv[i];
for (j = 0; internal_card_drivers[j].name != NULL; j++)
for (j = 0; internal_card_drivers[j].name != NULL; j++) {
if (strcmp(ent->name, internal_card_drivers[j].name) == 0) {
func = (struct sc_card_driver *(*)(void)) internal_card_drivers[j].func;
break;
}
}
if (func == NULL) {
for (j = 0; old_card_drivers[j].name != NULL; j++) {
if (strcmp(ent->name, old_card_drivers[j].name) == 0) {
func = (struct sc_card_driver *(*)(void)) old_card_drivers[j].func;
break;
}
}
}
/* if not initialized assume external module */
if (func == NULL)
*(void **)(tfunc) = load_dynamic_driver(ctx, &dll, ent->name);