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

fixed incompatible function usage 

Signed-off-by: Frank Morgner <morgner@informatik.hu-berlin.de>
This commit is contained in:
Frank Morgner 2014-03-01 16:32:39 +01:00 committed by Viktor Tarasov
parent a64326e768
commit 3b50ccc0ea
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libopensc/pkcs15-piv.c
View File

@ -120,7 +120,7 @@ typedef struct common_key_info_st {
*/
static int piv_get_guid(struct sc_pkcs15_card *p15card, const struct sc_pkcs15_object *obj,
unsigned char *out, size_t out_size)
unsigned char *out, size_t *out_size)
{
struct sc_serial_number serialnr;
struct sc_pkcs15_id id;
@ -130,7 +130,7 @@ static int piv_get_guid(struct sc_pkcs15_card *p15card, const struct sc_pkcs15_o
unsigned char fbit, fbits, fbyte, fbyte2, fnibble;
unsigned char *f5p, *f8p;
if (!p15card || !obj || !out || out_size < 3)
if (!p15card || !obj || !out || *out_size < 3)
return SC_ERROR_INCORRECT_PARAMETERS;
r = sc_pkcs15_get_object_id(obj, &id);
@ -142,7 +142,7 @@ static int piv_get_guid(struct sc_pkcs15_card *p15card, const struct sc_pkcs15_o
return r;
memset(guid_bin, 0, sizeof(guid_bin));
memset(out, 0, out_size);
memset(out, 0, *out_size);
if (id.len == 1 && serialnr.len == 25) {
@ -212,7 +212,7 @@ static int piv_get_guid(struct sc_pkcs15_card *p15card, const struct sc_pkcs15_o
}
/* reserve one byte for the 'C' line ending */
bin_size = (out_size - 1)/2;
bin_size = (*out_size - 1)/2;
if (bin_size > tlen)
bin_size = tlen;