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

removed configuration option `force_card_driver` 

Use `card_drivers` or `OPENSC_DRIVER` instead
This commit is contained in:
Frank Morgner 2018-01-30 15:19:00 +01:00
parent 6ab6d7bad9
commit 4fca7d08c1
3 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/opensc.conf.in
View File

@ -27,7 +27,7 @@ app default {
#
# profile_dir = @PROFILE_DIR@;
# Dsiable pop-ups of built-in GUI
# Disable pop-ups of built-in GUI
#
# Default: false
# disable_popups = true;
@ -170,15 +170,6 @@ app default {
#st_key = ZZSTTERM00001.pkcs8;
}
# Force using specific card driver
#
# If this option is present, OpenSC will use the supplied
# driver with all inserted cards.
#
# Default: autodetect
#
# force_card_driver = customcos;
# Configuration block for DNIe
#
# Card DNIe has an option to show an extra warning before

9
solaris/opensc.conf-dist
View File

@ -136,15 +136,6 @@ app default {
# atr = 55:66:77:88:99:aa:bb;
# }
# Force using specific card driver
#
# If this option is present, OpenSC will use the supplied
# driver with all inserted cards.
#
# Default: autodetect
#
# force_card_driver = miocos;
# Below are the framework specific configuration blocks.
# PKCS #15

22
src/libopensc/ctx.c
View File

@ -139,7 +139,6 @@ static const struct _sc_driver_entry old_card_drivers[] = {
struct _sc_ctx_options {
struct _sc_driver_entry cdrv[SC_MAX_CARD_DRIVERS];
int ccount;
char *forced_card_driver;
};
@ -367,13 +366,6 @@ load_parameters(sc_context_t *ctx, scconf_block *block, struct _sc_ctx_options *
ctx->flags & SC_CTX_FLAG_ENABLE_DEFAULT_DRIVER))
ctx->flags |= SC_CTX_FLAG_ENABLE_DEFAULT_DRIVER;
val = scconf_get_str(block, "force_card_driver", NULL);
if (val) {
if (opts->forced_card_driver)
free(opts->forced_card_driver);
opts->forced_card_driver = strdup(val);
}
list = scconf_find_list(block, "card_drivers");
if (list != NULL)
del_drvs(opts);
@ -835,16 +827,10 @@ int sc_context_create(sc_context_t **ctx_out, const sc_context_param_t *parm)
load_card_drivers(ctx, &opts);
load_card_atrs(ctx);
if (!opts.forced_card_driver) {
char *driver = getenv("OPENSC_DRIVER");
if(driver) {
opts.forced_card_driver = strdup(driver);
}
}
if (opts.forced_card_driver) {
if (SC_SUCCESS != sc_set_card_driver(ctx, opts.forced_card_driver))
sc_log(ctx, "Warning: Could not load %s.", opts.forced_card_driver);
free(opts.forced_card_driver);
char *driver = getenv("OPENSC_DRIVER");
if (driver) {
if (SC_SUCCESS != sc_set_card_driver(ctx, driver))
sc_log(ctx, "Warning: Could not load %s.", driver);
}
del_drvs(&opts);
sc_ctx_detect_readers(ctx);