From 250364c06073a58cd89fbf3c4b89b4a85555f231 Mon Sep 17 00:00:00 2001 From: Viktor Tarasov Date: Fri, 4 Jan 2013 19:03:46 +0100 Subject: [PATCH] pkcs15init: fix spurious gcc overflow warning, thanks to Milan Broz (mbroz@redhat.com) As discussed in pull request #115 (https://github.com/OpenSC/OpenSC/pull/115), 'if' test of impossible condition is removed in 'cardos' and 'incypto34' card drivers. --- src/pkcs15init/pkcs15-cardos.c | 2 -- src/pkcs15init/pkcs15-incrypto34.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c index 6d5780f4..4576d700 100644 --- a/src/pkcs15init/pkcs15-cardos.c +++ b/src/pkcs15init/pkcs15-cardos.c @@ -170,8 +170,6 @@ cardos_select_pin_reference(sc_profile_t *profile, sc_pkcs15_card_t *p15card, /* PINs are even numbered, PUKs are odd */ if (!(preferred & 1)) preferred++; - if (preferred >= 126) - return SC_ERROR_TOO_MANY_OBJECTS; } if (current > preferred || preferred > CARDOS_PIN_ID_MAX) diff --git a/src/pkcs15init/pkcs15-incrypto34.c b/src/pkcs15init/pkcs15-incrypto34.c index 39ecb032..baafc2ec 100644 --- a/src/pkcs15init/pkcs15-incrypto34.c +++ b/src/pkcs15init/pkcs15-incrypto34.c @@ -189,8 +189,6 @@ incrypto34_select_pin_reference(sc_profile_t *profile, sc_pkcs15_card_t *p15card /* PINs are even numbered, PUKs are odd */ if (!(preferred & 1)) preferred++; - if (preferred >= 126) - return SC_ERROR_TOO_MANY_OBJECTS; } if (current > preferred || preferred > INCRYPTO34_PIN_ID_MAX)