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

OpenPGP: cleanup & fix pgp_update_binary() 

* use LOG_FUNC_CALLED() .. LOG_FUNC_RETURN for "symmetric" logging
* update comment
* check that blob->data is defined
* fix writing new data to the correct offset
* use calloc() instead of malloc() & memset()
* align pgp_ops function pointer list
This commit is contained in:
Peter Marschall 2012-06-07 19:55:21 +02:00
parent c8e802eab6
commit d7f58f7ea7
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libopensc/card-openpgp.c
View File

@ -1545,38 +1545,40 @@ static int pgp_delete_file(sc_card_t *card, const sc_path_t *path)
return r;
}
/* ABI: Update binary */
static int pgp_update_binary(sc_card_t *card, unsigned int idx,
const u8 *buf, size_t count, unsigned long flags)
/* ABI: UPDATE BINARY */
static int
pgp_update_binary(sc_card_t *card, unsigned int idx,
const u8 *buf, size_t count, unsigned long flags)
{
struct pgp_priv_data *priv = DRVDATA(card);
struct blob *affected_blob = priv->current;
struct blob *blob = priv->current;
u8 *alldata;
size_t allength;
int r;
LOG_FUNC_CALLED(card->ctx);
/* We will use PUT DATA to write to DO.
* This command does not support index, so we will write the overall data,
* in which the part before idx is get from old content of DO */
allength = idx + count;
alldata = malloc(allength);
alldata = calloc(allength, 1);
if (alldata == NULL)
LOG_FUNC_RETURN(card->ctx, SC_ERROR_OUT_OF_MEMORY);
memset(alldata, 0, allength);
/* Copy the part before idx */
memcpy(alldata, affected_blob->data, MIN(idx, affected_blob->len));
if (blob->data)
memcpy(alldata, blob->data, MIN(idx, blob->len));
/* Copy data need to be written */
memcpy(alldata, buf, count);
memcpy(alldata+idx, buf, count);
r = pgp_put_data(card, affected_blob->id, alldata, allength);
if (r < 0) {
sc_log(card->ctx, "Failed to update binary. %s", sc_strerror(r));
}
r = pgp_put_data(card, blob->id, alldata, allength);
free(alldata);
return r;
LOG_FUNC_RETURN(card->ctx, r);
}
/* ABI: driver binding stuff */
static struct sc_card_driver *
sc_get_driver(void)
@ -1601,7 +1603,7 @@ sc_get_driver(void)
pgp_ops.decipher = pgp_decipher;
pgp_ops.card_ctl = pgp_card_ctl;
pgp_ops.delete_file = pgp_delete_file;
pgp_ops.update_binary = pgp_update_binary;
pgp_ops.update_binary = pgp_update_binary;
return &pgp_drv;
}