From aca0d08e29270df84012c3db64afb64d4b04e9a2 Mon Sep 17 00:00:00 2001 From: Zoltan Kelemen Date: Sun, 5 Jul 2020 05:44:39 +0200 Subject: [PATCH] Removed the 'crts' field from 'sc_acl_entry' type since: - its definition is specific to the IAS-ECC card type - its presence can not be assumed since it is read from non-mandatory SE type of an SDO - it is currently not used anywhere in the code --- src/libopensc/sc.c | 6 +++--- src/libopensc/types.h | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/libopensc/sc.c b/src/libopensc/sc.c index 63e93d65..29f6b868 100644 --- a/src/libopensc/sc.c +++ b/src/libopensc/sc.c @@ -555,13 +555,13 @@ const sc_acl_entry_t * sc_file_get_acl_entry(const sc_file_t *file, { sc_acl_entry_t *p; static const sc_acl_entry_t e_never = { - SC_AC_NEVER, SC_AC_KEY_REF_NONE, {{0, 0, 0, {0}}}, NULL + SC_AC_NEVER, SC_AC_KEY_REF_NONE, NULL }; static const sc_acl_entry_t e_none = { - SC_AC_NONE, SC_AC_KEY_REF_NONE, {{0, 0, 0, {0}}}, NULL + SC_AC_NONE, SC_AC_KEY_REF_NONE, NULL }; static const sc_acl_entry_t e_unknown = { - SC_AC_UNKNOWN, SC_AC_KEY_REF_NONE, {{0, 0, 0, {0}}}, NULL + SC_AC_UNKNOWN, SC_AC_KEY_REF_NONE, NULL }; if (file == NULL || operation >= SC_MAX_AC_OPS) { diff --git a/src/libopensc/types.h b/src/libopensc/types.h index 1a91d331..a21d9705 100644 --- a/src/libopensc/types.h +++ b/src/libopensc/types.h @@ -204,9 +204,6 @@ struct sc_crt { typedef struct sc_acl_entry { unsigned int method; /* See SC_AC_* */ unsigned int key_ref; /* SC_AC_KEY_REF_NONE or an integer */ - - struct sc_crt crts[SC_MAX_CRTS_IN_SE]; - struct sc_acl_entry *next; } sc_acl_entry_t;