giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #699 from LudovicRousseau/master 

Fix compiler warnings
This commit is contained in:
Ludovic Rousseau 2016-03-02 15:35:41 +01:00
parent bc812aa132 ae67f16e9b
commit 68ee135e3c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libopensc/card-authentic.c
View File

@ -1449,7 +1449,7 @@ authentic_pin_change(struct sc_card *card, struct sc_pin_cmd_data *data, int *tr
memset(prv_data->pins_sha1[data->pin_reference], 0, sizeof(prv_data->pins_sha1[0]));
if (!data->pin1.data && !data->pin1.len && &data->pin2.data && !data->pin2.len) {
if (!data->pin1.data && !data->pin1.len && !data->pin2.data && !data->pin2.len) {
if (!(card->reader->capabilities & SC_READER_CAP_PIN_PAD))
LOG_TEST_RET(ctx, SC_ERROR_NOT_SUPPORTED, "PIN pad not supported");
rv = authentic_pin_change_pinpad(card, data->pin_reference, tries_left);

4
src/libopensc/card-iasecc.c
View File

@ -2319,7 +2319,7 @@ iasecc_pin_change(struct sc_card *card, struct sc_pin_cmd_data *data, int *tries
sc_log(ctx, "Change PIN(ref:%i,type:0x%X,lengths:%i/%i)", reference, data->pin_type, data->pin1.len, data->pin2.len);
if ((card->reader->capabilities & SC_READER_CAP_PIN_PAD)) {
if (!data->pin1.data && !data->pin1.len && &data->pin2.data && !data->pin2.len) {
if (!data->pin1.data && !data->pin1.len && !data->pin2.data && !data->pin2.len) {
rv = iasecc_chv_change_pinpad(card, reference, tries_left);
sc_log(ctx, "iasecc_pin_cmd(SC_PIN_CMD_CHANGE) chv_change_pinpad returned %i", rv);
LOG_FUNC_RETURN(ctx, rv);
@ -3182,7 +3182,7 @@ iasecc_compute_signature_dst(struct sc_card *card,
size_t offs = 0, hash_len = 0;
unsigned char sbuf[SC_MAX_APDU_BUFFER_SIZE];
unsigned char rbuf[SC_MAX_APDU_BUFFER_SIZE];
int rv;
int rv = SC_SUCCESS;
LOG_FUNC_CALLED(ctx);
sc_log(ctx, "iasecc_compute_signature_dst() input length %i", in_len);

2
src/smm/sm-card-iasecc.c
View File

@ -185,7 +185,7 @@ sm_iasecc_get_apdu_create_file(struct sc_context *ctx, struct sm_info *sm_info,
static int
sm_iasecc_get_apdu_delete_file(struct sc_context *ctx, struct sm_info *sm_info, struct sc_remote_data *rdata)
{
unsigned int file_id = (unsigned int)sm_info->cmd_data;
unsigned int file_id = (unsigned int)(long)sm_info->cmd_data;
struct sc_remote_apdu *rapdu = NULL;
int rv;