From b2df781e8db0329d6472c32a537a0f5e3b1dbc88 Mon Sep 17 00:00:00 2001 From: aj Date: Wed, 21 Oct 2009 07:22:56 +0000 Subject: [PATCH] =?UTF-8?q?Fix=20warnings=20in=20muscle=20code=20-=20by=20?= =?UTF-8?q?=20Jo=C3=A3o=20Poupino.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3779 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/muscle.c | 5 +++-- src/libopensc/muscle.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libopensc/muscle.c b/src/libopensc/muscle.c index fcee6de9..46a07efb 100644 --- a/src/libopensc/muscle.c +++ b/src/libopensc/muscle.c @@ -427,10 +427,11 @@ void msc_change_pin_apdu(sc_card_t *card, sc_apdu_t *apdu, u8* buffer, size_t bu apdu->data = buffer; } -int msc_get_challenge(sc_card_t *card, short dataLength, short seedLength, u8 *seedData, u8* outputData) +int msc_get_challenge(sc_card_t *card, unsigned short dataLength, unsigned short seedLength, u8 *seedData, u8 *outputData) { sc_apdu_t apdu; - int r, location, cse, len; + int r, location, cse; + size_t len; u8 *buffer, *ptr; location = (dataLength < MSC_MAX_READ) ? 1 : 2; /* 1 == APDU, 2 == (seed in 0xFFFFFFFE, out in 0xFFFFFFFF) */ diff --git a/src/libopensc/muscle.h b/src/libopensc/muscle.h index e39cd533..746124fb 100644 --- a/src/libopensc/muscle.h +++ b/src/libopensc/muscle.h @@ -54,7 +54,7 @@ void msc_unblock_pin_apdu(sc_card_t *card, sc_apdu_t *apdu, u8* buffer, size_t b int msc_change_pin(sc_card_t *card, int pinNumber, const u8 *pinValue, int pinLength, const u8 *newPin, int newPinLength, int *tries); void msc_change_pin_apdu(sc_card_t *card, sc_apdu_t *apdu, u8* buffer, size_t bufferLength, int pinNumber, const u8 *pinValue, int pinLength, const u8 *newPin, int newPinLength); -int msc_get_challenge(sc_card_t *card, short dataLength, short seedLength, u8 *seedData, u8* outputData); +int msc_get_challenge(sc_card_t *card, unsigned short dataLength, unsigned short seedLength, u8 *seedData, u8 *outputData); int msc_generate_keypair(sc_card_t *card, int privateKey, int publicKey, int algorithm, int keySize, int options); int msc_extract_rsa_public_key(sc_card_t *card,