From 7cec500e549471cdbac2905eb6f5ae50cba2a4ee Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Wed, 22 Jul 2015 17:25:35 +0200 Subject: [PATCH] added flags to sc_context_t - is initialized in sc_context_create with parm->flags - removes members paranoid_memory and enable_default_driver --- configure.ac | 4 ++-- src/libopensc/card.c | 3 ++- src/libopensc/ctx.c | 15 +++++++++------ src/libopensc/opensc.h | 10 ++++++---- src/libopensc/reader-ctapi.c | 8 ++++---- src/libopensc/reader-openct.c | 14 +++++++------- src/libopensc/reader-pcsc.c | 16 ++++++++-------- src/libopensc/sc.c | 2 +- src/pkcs11/pkcs11-global.c | 2 +- src/tools/opensc-explorer.c | 2 +- src/tools/opensc-tool.c | 2 +- 11 files changed, 42 insertions(+), 36 deletions(-) diff --git a/configure.ac b/configure.ac index f0bbb3eb..4953e206 100644 --- a/configure.ac +++ b/configure.ac @@ -39,8 +39,8 @@ OPENSC_VS_FF_PRODUCT_NAME="VS_FF_PRODUCT_NAME" # (Code changed: REVISION++) # (Oldest interface removed: OLDEST++) # (Interfaces added: CURRENT++, REVISION=0) -OPENSC_LT_CURRENT="3" -OPENSC_LT_OLDEST="3" +OPENSC_LT_CURRENT="4" +OPENSC_LT_OLDEST="4" OPENSC_LT_REVISION="0" OPENSC_LT_AGE="0" OPENSC_LT_AGE="$((${OPENSC_LT_CURRENT}-${OPENSC_LT_OLDEST}))" diff --git a/src/libopensc/card.c b/src/libopensc/card.c index 7daee5c5..7e1d8ad2 100644 --- a/src/libopensc/card.c +++ b/src/libopensc/card.c @@ -218,7 +218,8 @@ int sc_connect_card(sc_reader_t *reader, sc_card_t **card_out) if (ops == NULL || ops->match_card == NULL) { continue; } - else if (!ctx->enable_default_driver && !strcmp("default", drv->short_name)) { + else if (!(ctx->flags & SC_CTX_FLAG_ENABLE_DEFAULT_DRIVER) + && !strcmp("default", drv->short_name)) { sc_log(ctx , "ignore 'default' card driver"); continue; } diff --git a/src/libopensc/ctx.c b/src/libopensc/ctx.c index 46700084..71216685 100644 --- a/src/libopensc/ctx.c +++ b/src/libopensc/ctx.c @@ -186,8 +186,7 @@ static void set_defaults(sc_context_t *ctx, struct _sc_ctx_options *opts) if (ctx->debug_file && (ctx->debug_file != stderr && ctx->debug_file != stdout)) fclose(ctx->debug_file); ctx->debug_file = stderr; - ctx->paranoid_memory = 0; - ctx->enable_default_driver = 0; + ctx->flags = 0; #ifdef __APPLE__ /* Override the default debug log for OpenSC.tokend to be different from PKCS#11. @@ -258,11 +257,13 @@ load_parameters(sc_context_t *ctx, scconf_block *block, struct _sc_ctx_options * sc_ctx_log_to_file(ctx, val); } - ctx->paranoid_memory = scconf_get_bool (block, "paranoid-memory", - ctx->paranoid_memory); + if (scconf_get_bool (block, "paranoid-memory", + ctx->flags & SC_CTX_FLAG_PARANOID_MEMORY)) + ctx->flags |= SC_CTX_FLAG_PARANOID_MEMORY; - ctx->enable_default_driver = scconf_get_bool (block, "enable_default_driver", - ctx->enable_default_driver); + if (scconf_get_bool (block, "enable_default_driver", + 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) { @@ -710,7 +711,9 @@ int sc_context_create(sc_context_t **ctx_out, const sc_context_param_t *parm) return SC_ERROR_OUT_OF_MEMORY; } + ctx->flags = parm->flags; set_defaults(ctx, &opts); + list_init(&ctx->readers); list_attributes_seeker(&ctx->readers, reader_list_seeker); /* set thread context and create mutex object (if specified) */ diff --git a/src/libopensc/opensc.h b/src/libopensc/opensc.h index 083195a0..c7074e58 100644 --- a/src/libopensc/opensc.h +++ b/src/libopensc/opensc.h @@ -647,15 +647,17 @@ typedef struct { * process indicates that shall the reader shall ignore those resources when * calling sc_disconnect_card. */ -#define SC_TERMINATE 0x00000001 +#define SC_CTX_FLAG_TERMINATE 0x00000001 +#define SC_CTX_FLAG_PARANOID_MEMORY 0x00000002 +#define SC_CTX_FLAG_DEBUG_MEMORY 0x00000004 +#define SC_CTX_FLAG_ENABLE_DEFAULT_DRIVER 0x00000008 typedef struct sc_context { scconf_context *conf; scconf_block *conf_blocks[3]; char *app_name; int debug; - int paranoid_memory; - int enable_default_driver; + unsigned long flags; FILE *debug_file; char *debug_filename; @@ -729,7 +731,7 @@ typedef struct { * dependend configuration data). If NULL the name "default" * will be used. */ const char *app_name; - /** flags, currently unused */ + /** context flags */ unsigned long flags; /** mutex functions to use (optional) */ sc_thread_context_t *thread_ctx; diff --git a/src/libopensc/reader-ctapi.c b/src/libopensc/reader-ctapi.c index 68de2b2d..c526500d 100644 --- a/src/libopensc/reader-ctapi.c +++ b/src/libopensc/reader-ctapi.c @@ -116,7 +116,7 @@ static int refresh_attributes(sc_reader_t *reader) u8 cmd[5], rbuf[256], sad, dad; unsigned short lr; - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; cmd[0] = CTBCS_CLA; @@ -162,7 +162,7 @@ static int ctapi_internal_transmit(sc_reader_t *reader, unsigned short lr; char rv; - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; if (control) @@ -241,7 +241,7 @@ static int ctapi_connect(sc_reader_t *reader) unsigned short lr; int r; - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; cmd[0] = CTBCS_CLA; @@ -290,7 +290,7 @@ static int ctapi_release(sc_reader_t *reader) struct ctapi_private_data *priv = GET_PRIV_DATA(reader); - if (!(reader->ctx->magic & SC_TERMINATE)) + if (!(reader->ctx->flags & SC_CTX_FLAG_TERMINATE)) priv->funcs.CT_close(priv->ctn); free(priv); diff --git a/src/libopensc/reader-openct.c b/src/libopensc/reader-openct.c index faa8288a..2d7d6bd9 100644 --- a/src/libopensc/reader-openct.c +++ b/src/libopensc/reader-openct.c @@ -154,7 +154,7 @@ static int openct_reader_release(sc_reader_t *reader) SC_FUNC_CALLED(reader->ctx, SC_LOG_DEBUG_VERBOSE); if (data) { - if (data->h && !(reader->ctx->magic & SC_TERMINATE)) + if (data->h && !(reader->ctx->flags & SC_CTX_FLAG_TERMINATE)) ct_reader_disconnect(data->h); sc_mem_clear(data, sizeof(*data)); reader->drv_data = NULL; @@ -174,7 +174,7 @@ static int openct_reader_detect_card_presence(sc_reader_t *reader) SC_FUNC_CALLED(reader->ctx, SC_LOG_DEBUG_VERBOSE); - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; reader->flags = 0; @@ -200,7 +200,7 @@ openct_reader_connect(sc_reader_t *reader) SC_FUNC_CALLED(reader->ctx, SC_LOG_DEBUG_VERBOSE); - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; if (data->h) @@ -262,7 +262,7 @@ openct_reader_internal_transmit(sc_reader_t *reader, struct driver_data *data = (struct driver_data *) reader->drv_data; int rc; - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; /* Hotplug check */ @@ -333,7 +333,7 @@ static int openct_reader_perform_verify(sc_reader_t *reader, struct sc_pin_cmd_d u8 buf[254]; int rc; - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; /* Hotplug check */ @@ -394,7 +394,7 @@ static int openct_reader_lock(sc_reader_t *reader) SC_FUNC_CALLED(reader->ctx, SC_LOG_DEBUG_VERBOSE); - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; /* Hotplug check */ @@ -423,7 +423,7 @@ static int openct_reader_unlock(sc_reader_t *reader) SC_FUNC_CALLED(reader->ctx, SC_LOG_DEBUG_VERBOSE); - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; /* Not connected */ diff --git a/src/libopensc/reader-pcsc.c b/src/libopensc/reader-pcsc.c index a5ff6975..67dc2802 100644 --- a/src/libopensc/reader-pcsc.c +++ b/src/libopensc/reader-pcsc.c @@ -184,7 +184,7 @@ static int pcsc_internal_transmit(sc_reader_t *reader, SC_FUNC_CALLED(reader->ctx, SC_LOG_DEBUG_NORMAL); card = priv->pcsc_card; - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; sSendPci.dwProtocol = opensc_proto_to_pcsc(reader->active_protocol); @@ -287,7 +287,7 @@ static int refresh_attributes(sc_reader_t *reader) sc_debug(reader->ctx, SC_LOG_DEBUG_NORMAL, "%s check", reader->name); - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; if (priv->reader_state.szReader == NULL) { @@ -511,7 +511,7 @@ static int pcsc_disconnect(sc_reader_t * reader) SC_FUNC_CALLED(reader->ctx, SC_LOG_DEBUG_NORMAL); - if (!(reader->ctx->magic & SC_TERMINATE)) + if (!(reader->ctx->flags & SC_CTX_FLAG_TERMINATE)) priv->gpriv->SCardDisconnect(priv->pcsc_card, priv->gpriv->disconnect_action); reader->flags = 0; return SC_SUCCESS; @@ -525,7 +525,7 @@ static int pcsc_lock(sc_reader_t *reader) SC_FUNC_CALLED(reader->ctx, SC_LOG_DEBUG_NORMAL); - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; rv = priv->gpriv->SCardBeginTransaction(priv->pcsc_card); @@ -565,7 +565,7 @@ static int pcsc_unlock(sc_reader_t *reader) SC_FUNC_CALLED(reader->ctx, SC_LOG_DEBUG_NORMAL); - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; rv = priv->gpriv->SCardEndTransaction(priv->pcsc_card, priv->gpriv->transaction_end_action); @@ -611,7 +611,7 @@ static int pcsc_cancel(sc_context_t *ctx) SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_NORMAL); - if (ctx->magic & SC_TERMINATE) + if (ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; #ifndef _WIN32 @@ -766,7 +766,7 @@ static int pcsc_finish(sc_context_t *ctx) SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_NORMAL); if (gpriv) { - if (gpriv->pcsc_ctx != -1 && !(ctx->magic & SC_TERMINATE)) + if (gpriv->pcsc_ctx != -1 && !(ctx->flags & SC_CTX_FLAG_TERMINATE)) gpriv->SCardReleaseContext(gpriv->pcsc_ctx); if (gpriv->dlhandle != NULL) sc_dlclose(gpriv->dlhandle); @@ -1662,7 +1662,7 @@ pcsc_pin_cmd(sc_reader_t *reader, struct sc_pin_cmd_data *data) SC_FUNC_CALLED(reader->ctx, SC_LOG_DEBUG_NORMAL); - if (reader->ctx->magic & SC_TERMINATE) + if (reader->ctx->flags & SC_CTX_FLAG_TERMINATE) return SC_ERROR_NOT_ALLOWED; if (priv->gpriv->SCardControl == NULL) diff --git a/src/libopensc/sc.c b/src/libopensc/sc.c index 052d6ebc..5cddd32e 100644 --- a/src/libopensc/sc.c +++ b/src/libopensc/sc.c @@ -806,7 +806,7 @@ void *sc_mem_alloc_secure(sc_context_t *ctx, size_t len) locked = 1; #endif if (!locked) { - if (ctx->paranoid_memory) { + if (ctx->flags & SC_CTX_FLAG_PARANOID_MEMORY) { sc_do_log (ctx, 0, NULL, 0, NULL, "cannot lock memory, failing allocation because paranoid set"); free (pointer); pointer = NULL; diff --git a/src/pkcs11/pkcs11-global.c b/src/pkcs11/pkcs11-global.c index 364313bf..2416f3fa 100644 --- a/src/pkcs11/pkcs11-global.c +++ b/src/pkcs11/pkcs11-global.c @@ -206,7 +206,7 @@ CK_RV C_Initialize(CK_VOID_PTR pInitArgs) /* Handle fork() exception */ if (current_pid != initialized_pid) { if (context) - context->magic |= SC_TERMINATE; + context->flags |= SC_CTX_FLAG_TERMINATE; C_Finalize(NULL_PTR); } initialized_pid = current_pid; diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c index fa2581bb..75588df7 100644 --- a/src/tools/opensc-explorer.c +++ b/src/tools/opensc-explorer.c @@ -1836,7 +1836,7 @@ int main(int argc, char * const argv[]) return 1; } - ctx->enable_default_driver = 1; + ctx->flags |= SC_CTX_FLAG_ENABLE_DEFAULT_DRIVER; if (verbose > 1) { ctx->debug = verbose; diff --git a/src/tools/opensc-tool.c b/src/tools/opensc-tool.c index d9079840..aea526e5 100644 --- a/src/tools/opensc-tool.c +++ b/src/tools/opensc-tool.c @@ -758,7 +758,7 @@ int main(int argc, char * const argv[]) return 1; } - ctx->enable_default_driver = 1; + ctx->flags |= SC_CTX_FLAG_ENABLE_DEFAULT_DRIVER; if (verbose > 1) { ctx->debug = verbose;