From ca01d2c5e2c91bc113b3fcc40c87f3825a0dde52 Mon Sep 17 00:00:00 2001 From: Georgi Kirichkov Date: Thu, 6 May 2021 20:28:49 +0300 Subject: [PATCH] Code style changes --- src/libopensc/card-idprime.c | 18 +++++++++--------- src/libopensc/pkcs15-idprime.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libopensc/card-idprime.c b/src/libopensc/card-idprime.c index 5ea7a8f0..232d725f 100644 --- a/src/libopensc/card-idprime.c +++ b/src/libopensc/card-idprime.c @@ -203,16 +203,16 @@ static int idprime_process_index(sc_card_t *card, idprime_private_data_t *priv, if (start[8] >= '0' && start[8] <= '9') { key_id = start[8] - '0'; } - if (card->type == SC_CARD_TYPE_IDPRIME_V2) { - /* The key reference starts from 0x11 and increments by the key id (ASCII) */ + switch (card->type) { + case SC_CARD_TYPE_IDPRIME_V2: new_object.key_reference = 0x11 + key_id; - } else { - if (card->type == SC_CARD_TYPE_IDPRIME_V3) { /* V3 */ - /* The key reference starts from 0xF7 and increments by the key id (ASCII) */ - new_object.key_reference = 0xF7 + key_id; - } else { /* V4 */ - new_object.key_reference = 0x56 + key_id; - } + break; + case SC_CARD_TYPE_IDPRIME_V3: + new_object.key_reference = 0xF7 + key_id; + break; + case SC_CARD_TYPE_IDPRIME_V4: + new_object.key_reference = 0x56 + key_id; + break; } } sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Found certificate with fd=%d, key_ref=%d", diff --git a/src/libopensc/pkcs15-idprime.c b/src/libopensc/pkcs15-idprime.c index acbae3fd..9d8eb111 100644 --- a/src/libopensc/pkcs15-idprime.c +++ b/src/libopensc/pkcs15-idprime.c @@ -99,7 +99,7 @@ static int sc_pkcs15emu_idprime_init(sc_pkcs15_card_t *p15card) pin_info.tries_left = -1; if (card->type == SC_CARD_TYPE_IDPRIME_V3 || - card->type == SC_CARD_TYPE_IDPRIME_V4) { + card->type == SC_CARD_TYPE_IDPRIME_V4) { pin_info.attrs.pin.flags |= SC_PKCS15_PIN_FLAG_NEEDS_PADDING; pin_info.attrs.pin.stored_length = 16; pin_info.attrs.pin.pad_char = 0x00;