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

iasecc: coverity scan warning OVERRUN-STATIC

Browse Source 
CID 402562: Out-of-bounds read (OVERRUN_STATIC)
This commit is contained in:
Viktor Tarasov 2012-06-11 20:59:45 +02:00
parent 12dcf13236
commit aa46a210fc
3 changed files with 57 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
src/libopensc/iasecc-sdo.c
View File

@ -1,9 +1,9 @@
/* /*
* iasecc-sdo.c: library to manipulate the Security Data Objects (SDO) * iasecc-sdo.c: library to manipulate the Security Data Objects (SDO)
* used by IAS/ECC card support. * used by IAS/ECC card support.
* *
* Copyright (C) 2010 Viktor Tarasov <vtarasov@opentrust.com> * Copyright (C) 2010 Viktor Tarasov <vtarasov@opentrust.com>
* OpenTrust <www.opentrust.com> * OpenTrust <www.opentrust.com>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -44,7 +44,7 @@ iasecc_parse_acls(struct sc_card *card, struct iasecc_sdo_docp *docp, int flags)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
struct iasecc_extended_tlv *acls = &docp->acls_contact; struct iasecc_extended_tlv *acls = &docp->acls_contact;
int ii, offs; int ii, offs;
unsigned char mask = 0x40; unsigned char mask = 0x40;
if (flags) if (flags)
@ -67,15 +67,15 @@ iasecc_parse_acls(struct sc_card *card, struct iasecc_sdo_docp *docp, int flags)
int int
iasecc_sdo_convert_acl(struct sc_card *card, struct iasecc_sdo *sdo, iasecc_sdo_convert_acl(struct sc_card *card, struct iasecc_sdo *sdo,
unsigned char op, unsigned *out_method, unsigned *out_ref) unsigned char op, unsigned *out_method, unsigned *out_ref)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
struct acl_op { struct acl_op {
unsigned char op; unsigned char op;
unsigned char mask; unsigned char mask;
} ops[] = { } ops[] = {
{SC_AC_OP_PSO_COMPUTE_SIGNATURE,IASECC_ACL_PSO_SIGNATURE}, {SC_AC_OP_PSO_COMPUTE_SIGNATURE,IASECC_ACL_PSO_SIGNATURE},
{SC_AC_OP_INTERNAL_AUTHENTICATE,IASECC_ACL_INTERNAL_AUTHENTICATE}, {SC_AC_OP_INTERNAL_AUTHENTICATE,IASECC_ACL_INTERNAL_AUTHENTICATE},
{SC_AC_OP_PSO_DECRYPT, IASECC_ACL_PSO_DECIPHER}, {SC_AC_OP_PSO_DECRYPT, IASECC_ACL_PSO_DECIPHER},
{SC_AC_OP_GENERATE, IASECC_ACL_GENERATE_KEY}, {SC_AC_OP_GENERATE, IASECC_ACL_GENERATE_KEY},
@ -127,20 +127,20 @@ iasecc_sdo_convert_acl(struct sc_card *card, struct iasecc_sdo *sdo,
*out_method = SC_AC_AUT; *out_method = SC_AC_AUT;
else if ((scb & IASECC_SCB_METHOD_MASK) == IASECC_SCB_METHOD_SM) else if ((scb & IASECC_SCB_METHOD_MASK) == IASECC_SCB_METHOD_SM)
*out_method = SC_AC_PRO; *out_method = SC_AC_PRO;
else else
*out_method = SC_AC_SCB, *out_ref = scb; *out_method = SC_AC_SCB, *out_ref = scb;
break; break;
} }
} }
} }
sc_log(ctx, "returns method %X; ref %X", *out_method, *out_ref); sc_log(ctx, "returns method %X; ref %X", *out_method, *out_ref);
LOG_FUNC_RETURN(ctx, SC_SUCCESS); LOG_FUNC_RETURN(ctx, SC_SUCCESS);
} }
void void
iasecc_sdo_free_fields(struct sc_card *card, struct iasecc_sdo *sdo) iasecc_sdo_free_fields(struct sc_card *card, struct iasecc_sdo *sdo)
{ {
if (sdo->docp.tries_remaining.value) if (sdo->docp.tries_remaining.value)
@ -194,7 +194,8 @@ iasecc_sdo_free_fields(struct sc_card *card, struct iasecc_sdo *sdo)
} }
} }
void
void
iasecc_sdo_free(struct sc_card *card, struct iasecc_sdo *sdo) iasecc_sdo_free(struct sc_card *card, struct iasecc_sdo *sdo)
{ {
iasecc_sdo_free_fields(card, sdo); iasecc_sdo_free_fields(card, sdo);
@ -202,7 +203,7 @@ iasecc_sdo_free(struct sc_card *card, struct iasecc_sdo *sdo)
} }
static int static int
iasecc_crt_parse(struct sc_card *card, unsigned char *data, struct iasecc_se_info *se) iasecc_crt_parse(struct sc_card *card, unsigned char *data, struct iasecc_se_info *se)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -238,11 +239,11 @@ iasecc_crt_parse(struct sc_card *card, unsigned char *data, struct iasecc_se_inf
} }
} }
for (ii=0; ii<IASECC_SE_CRTS_MAX; ii++) for (ii=0; ii<SC_MAX_CRTS_IN_SE; ii++)
if (!se->crts[ii].tag) if (!se->crts[ii].tag)
break; break;
if (ii==IASECC_SE_CRTS_MAX) if (ii==SC_MAX_CRTS_IN_SE)
LOG_TEST_RET(ctx, SC_ERROR_UNKNOWN_DATA_RECEIVED, "iasecc_crt_parse() error: too much CRTs in SE"); LOG_TEST_RET(ctx, SC_ERROR_UNKNOWN_DATA_RECEIVED, "iasecc_crt_parse() error: too much CRTs in SE");
memcpy(&se->crts[ii], &crt, sizeof(crt)); memcpy(&se->crts[ii], &crt, sizeof(crt));
@ -260,10 +261,10 @@ iasecc_se_get_crt(struct sc_card *card, struct iasecc_se_info *se, struct sc_crt
LOG_FUNC_CALLED(ctx); LOG_FUNC_CALLED(ctx);
if (!se || !crt) if (!se || !crt)
LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS); LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
sc_log(ctx, "CRT search template: %X:%X:%X, refs %X:%X:...", sc_log(ctx, "CRT search template: %X:%X:%X, refs %X:%X:...",
crt->tag, crt->algo, crt->usage, crt->refs[0], crt->refs[1]); crt->tag, crt->algo, crt->usage, crt->refs[0], crt->refs[1]);
for (ii=0; ii<IASECC_SE_CRTS_MAX && se->crts[ii].tag; ii++) { for (ii=0; ii<SC_MAX_CRTS_IN_SE && se->crts[ii].tag; ii++) {
if (crt->tag != se->crts[ii].tag) if (crt->tag != se->crts[ii].tag)
continue; continue;
if (crt->algo && crt->algo != se->crts[ii].algo) if (crt->algo && crt->algo != se->crts[ii].algo)
@ -275,7 +276,7 @@ iasecc_se_get_crt(struct sc_card *card, struct iasecc_se_info *se, struct sc_crt
memcpy(crt, &se->crts[ii], sizeof(*crt)); memcpy(crt, &se->crts[ii], sizeof(*crt));
sc_log(ctx, "iasecc_se_get_crt() found CRT with refs %X:%X:...", sc_log(ctx, "iasecc_se_get_crt() found CRT with refs %X:%X:...",
se->crts[ii].refs[0], se->crts[ii].refs[1]); se->crts[ii].refs[0], se->crts[ii].refs[1]);
LOG_FUNC_RETURN(ctx, SC_SUCCESS); LOG_FUNC_RETURN(ctx, SC_SUCCESS);
} }
@ -286,7 +287,7 @@ iasecc_se_get_crt(struct sc_card *card, struct iasecc_se_info *se, struct sc_crt
int int
iasecc_se_get_crt_by_usage(struct sc_card *card, struct iasecc_se_info *se, unsigned char tag, iasecc_se_get_crt_by_usage(struct sc_card *card, struct iasecc_se_info *se, unsigned char tag,
unsigned char usage, struct sc_crt *crt) unsigned char usage, struct sc_crt *crt)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -297,7 +298,7 @@ iasecc_se_get_crt_by_usage(struct sc_card *card, struct iasecc_se_info *se, unsi
LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS); LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
sc_log(ctx, "CRT search template with TAG:0x%X and UQB:0x%X", tag, usage); sc_log(ctx, "CRT search template with TAG:0x%X and UQB:0x%X", tag, usage);
for (ii=0; ii<IASECC_SE_CRTS_MAX && se->crts[ii].tag; ii++) { for (ii=0; ii<SC_MAX_CRTS_IN_SE && se->crts[ii].tag; ii++) {
if (tag != se->crts[ii].tag) if (tag != se->crts[ii].tag)
continue; continue;
if (usage != se->crts[ii].usage) if (usage != se->crts[ii].usage)
@ -314,7 +315,7 @@ iasecc_se_get_crt_by_usage(struct sc_card *card, struct iasecc_se_info *se, unsi
} }
int int
iasecc_se_parse(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_se_info *se) iasecc_se_parse(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_se_info *se)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -358,7 +359,7 @@ iasecc_se_parse(struct sc_card *card, unsigned char *data, size_t data_len, stru
if (data_len != size + size_size + 1) if (data_len != size + size_size + 1)
LOG_TEST_RET(ctx, SC_ERROR_INVALID_DATA, "parse error: invalide SE data size"); LOG_TEST_RET(ctx, SC_ERROR_INVALID_DATA, "parse error: invalide SE data size");
offs = 1 + size_size; offs = 1 + size_size;
for (; offs < data_len;) { for (; offs < data_len;) {
rv = iasecc_crt_parse(card, data + offs, se); rv = iasecc_crt_parse(card, data + offs, se);
@ -374,7 +375,7 @@ iasecc_se_parse(struct sc_card *card, unsigned char *data, size_t data_len, stru
} }
static int static int
iasecc_parse_size(unsigned char *data, size_t *out) iasecc_parse_size(unsigned char *data, size_t *out)
{ {
if (*data < 0x80) { if (*data < 0x80) {
@ -394,7 +395,7 @@ iasecc_parse_size(unsigned char *data, size_t *out)
} }
static int static int
iasecc_parse_get_tlv(struct sc_card *card, unsigned char *data, struct iasecc_extended_tlv *tlv) iasecc_parse_get_tlv(struct sc_card *card, unsigned char *data, struct iasecc_extended_tlv *tlv)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -410,7 +411,7 @@ iasecc_parse_get_tlv(struct sc_card *card, unsigned char *data, struct iasecc_ex
tlv->tag = *data; tlv->tag = *data;
tag_len = 1; tag_len = 1;
} }
sc_log(ctx, "iasecc_parse_get_tlv() tlv->tag 0x%X", tlv->tag); sc_log(ctx, "iasecc_parse_get_tlv() tlv->tag 0x%X", tlv->tag);
size_len = iasecc_parse_size(data + tag_len, &tlv->size); size_len = iasecc_parse_size(data + tag_len, &tlv->size);
LOG_TEST_RET(ctx, size_len, "parse error: invalid size data"); LOG_TEST_RET(ctx, size_len, "parse error: invalid size data");
@ -427,7 +428,7 @@ iasecc_parse_get_tlv(struct sc_card *card, unsigned char *data, struct iasecc_ex
} }
static int static int
iasecc_parse_chv(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo_chv *chv) iasecc_parse_chv(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo_chv *chv)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -459,7 +460,7 @@ iasecc_parse_chv(struct sc_card *card, unsigned char *data, size_t data_len, str
} }
static int static int
iasecc_parse_prvkey(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo_prvkey *prvkey) iasecc_parse_prvkey(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo_prvkey *prvkey)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -487,7 +488,7 @@ iasecc_parse_prvkey(struct sc_card *card, unsigned char *data, size_t data_len,
} }
static int static int
iasecc_parse_pubkey(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo_pubkey *pubkey) iasecc_parse_pubkey(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo_pubkey *pubkey)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -523,7 +524,7 @@ iasecc_parse_pubkey(struct sc_card *card, unsigned char *data, size_t data_len,
} }
static int static int
iasecc_parse_keyset(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo_keyset *keyset) iasecc_parse_keyset(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo_keyset *keyset)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -551,7 +552,7 @@ iasecc_parse_keyset(struct sc_card *card, unsigned char *data, size_t data_len,
} }
static int static int
iasecc_parse_docp(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo *sdo) iasecc_parse_docp(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo *sdo)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -613,7 +614,7 @@ iasecc_parse_docp(struct sc_card *card, unsigned char *data, size_t data_len, st
} }
static int static int
iasecc_sdo_parse_data(struct sc_card *card, unsigned char *data, struct iasecc_sdo *sdo) iasecc_sdo_parse_data(struct sc_card *card, unsigned char *data, struct iasecc_sdo *sdo)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -691,7 +692,7 @@ iasecc_sdo_parse_data(struct sc_card *card, unsigned char *data, struct iasecc_s
} }
int int
iasecc_sdo_parse(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo *sdo) iasecc_sdo_parse(struct sc_card *card, unsigned char *data, size_t data_len, struct iasecc_sdo *sdo)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -723,7 +724,7 @@ iasecc_sdo_parse(struct sc_card *card, unsigned char *data, size_t data_len, str
if (data_len != size + size_size + 3) if (data_len != size + size_size + 3)
LOG_TEST_RET(ctx, SC_ERROR_INVALID_DATA, "parse error: invalide SDO data size"); LOG_TEST_RET(ctx, SC_ERROR_INVALID_DATA, "parse error: invalide SDO data size");
sc_log(ctx, "sz %i, sz_size %i", size, size_size); sc_log(ctx, "sz %i, sz_size %i", size, size_size);
offs = 3 + size_size; offs = 3 + size_size;
@ -743,8 +744,8 @@ iasecc_sdo_parse(struct sc_card *card, unsigned char *data, size_t data_len, str
} }
int int
iasecc_sdo_allocate_and_parse(struct sc_card *card, unsigned char *data, size_t data_len, iasecc_sdo_allocate_and_parse(struct sc_card *card, unsigned char *data, size_t data_len,
struct iasecc_sdo **out) struct iasecc_sdo **out)
{ {
struct sc_context *ctx = card->ctx; struct sc_context *ctx = card->ctx;
@ -757,7 +758,7 @@ iasecc_sdo_allocate_and_parse(struct sc_card *card, unsigned char *data, size_t
if (*data != IASECC_SDO_TAG_HEADER) if (*data != IASECC_SDO_TAG_HEADER)
LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_DATA); LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_DATA);
if (data_len < 3) if (data_len < 3)
LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_DATA); LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_DATA);
sdo = calloc(1, sizeof(struct iasecc_sdo)); sdo = calloc(1, sizeof(struct iasecc_sdo));
@ -778,7 +779,7 @@ iasecc_sdo_allocate_and_parse(struct sc_card *card, unsigned char *data, size_t
if (data_len != size + size_size + 3) if (data_len != size + size_size + 3)
LOG_TEST_RET(ctx, SC_ERROR_INVALID_DATA, "parse error: invalide SDO data size"); LOG_TEST_RET(ctx, SC_ERROR_INVALID_DATA, "parse error: invalide SDO data size");
sc_log(ctx, "sz %i, sz_size %i", size, size_size); sc_log(ctx, "sz %i, sz_size %i", size, size_size);
offs = 3 + size_size; offs = 3 + size_size;
@ -811,7 +812,7 @@ iasecc_update_blob(struct sc_context *ctx, struct iasecc_extended_tlv *tlv,
LOG_FUNC_RETURN(ctx, SC_SUCCESS); LOG_FUNC_RETURN(ctx, SC_SUCCESS);
sz = tlv->size + 2; sz = tlv->size + 2;
if (tlv->tag > 0xFF) if (tlv->tag > 0xFF)
sz += 1; sz += 1;
@ -819,11 +820,11 @@ iasecc_update_blob(struct sc_context *ctx, struct iasecc_extended_tlv *tlv,
sz += 1; sz += 1;
else if (tlv->size >= 0x100) else if (tlv->size >= 0x100)
sz += 2; sz += 2;
pp = realloc(*blob, *blob_size + sz); pp = realloc(*blob, *blob_size + sz);
if (!pp) if (!pp)
LOG_FUNC_RETURN(ctx, SC_ERROR_MEMORY_FAILURE); LOG_FUNC_RETURN(ctx, SC_ERROR_MEMORY_FAILURE);
if (tlv->tag > 0xFF) if (tlv->tag > 0xFF)
*(pp + *blob_size + offs++) = (tlv->tag >> 8) & 0xFF; *(pp + *blob_size + offs++) = (tlv->tag >> 8) & 0xFF;
*(pp + *blob_size + offs++) = tlv->tag & 0xFF; *(pp + *blob_size + offs++) = tlv->tag & 0xFF;
@ -853,7 +854,7 @@ iasecc_encode_docp(struct sc_context *ctx, struct iasecc_sdo_docp *docp, unsigne
unsigned char *st_blob, *tmp_blob, *docp_blob; unsigned char *st_blob, *tmp_blob, *docp_blob;
size_t blob_size; size_t blob_size;
int rv; int rv;
LOG_FUNC_CALLED(ctx); LOG_FUNC_CALLED(ctx);
if (!docp->acls_contact.size || (docp->size.size != 2)) if (!docp->acls_contact.size || (docp->size.size != 2))
LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_DATA); LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_DATA);
@ -955,7 +956,7 @@ iasecc_sdo_encode_create(struct sc_context *ctx, struct iasecc_sdo *sdo, unsigne
}; };
struct sc_asn1_entry c_asn1_create_data[2] = { struct sc_asn1_entry c_asn1_create_data[2] = {
{ "createData", SC_ASN1_STRUCT, SC_ASN1_TAG_SEQUENCE | SC_ASN1_APP | SC_ASN1_CONS, 0, NULL, NULL }, { "createData", SC_ASN1_STRUCT, SC_ASN1_TAG_SEQUENCE | SC_ASN1_APP | SC_ASN1_CONS, 0, NULL, NULL },
{ NULL, 0, 0, 0, NULL, NULL } { NULL, 0, 0, 0, NULL, NULL }
}; };
struct sc_asn1_entry asn1_docp_data[2], asn1_create_data[2]; struct sc_asn1_entry asn1_docp_data[2], asn1_create_data[2];
unsigned char *blob = NULL; unsigned char *blob = NULL;
@ -990,7 +991,7 @@ iasecc_sdo_encode_create(struct sc_context *ctx, struct iasecc_sdo *sdo, unsigne
} }
int int
iasecc_sdo_encode_update_field(struct sc_context *ctx, unsigned char sdo_class, unsigned char sdo_ref, iasecc_sdo_encode_update_field(struct sc_context *ctx, unsigned char sdo_class, unsigned char sdo_ref,
struct iasecc_extended_tlv *tlv, unsigned char **out) struct iasecc_extended_tlv *tlv, unsigned char **out)
{ {
@ -1000,19 +1001,19 @@ iasecc_sdo_encode_update_field(struct sc_context *ctx, unsigned char sdo_class,
struct sc_asn1_entry c_asn1_field_value[2] = { struct sc_asn1_entry c_asn1_field_value[2] = {
{ "fieldValue", SC_ASN1_OCTET_STRING, 0, SC_ASN1_ALLOC, NULL, NULL }, { "fieldValue", SC_ASN1_OCTET_STRING, 0, SC_ASN1_ALLOC, NULL, NULL },
{ NULL, 0, 0, 0, NULL, NULL } { NULL, 0, 0, 0, NULL, NULL }
}; };
struct sc_asn1_entry c_asn1_sdo_field[2] = { struct sc_asn1_entry c_asn1_sdo_field[2] = {
{ "sdoField", SC_ASN1_STRUCT, 0, 0, NULL, NULL }, { "sdoField", SC_ASN1_STRUCT, 0, 0, NULL, NULL },
{ NULL, 0, 0, 0, NULL, NULL } { NULL, 0, 0, 0, NULL, NULL }
}; };
struct sc_asn1_entry c_asn1_class_data[2] = { struct sc_asn1_entry c_asn1_class_data[2] = {
{ "classData", SC_ASN1_STRUCT, 0, 0, NULL, NULL }, { "classData", SC_ASN1_STRUCT, 0, 0, NULL, NULL },
{ NULL, 0, 0, 0, NULL, NULL } { NULL, 0, 0, 0, NULL, NULL }
}; };
struct sc_asn1_entry c_asn1_update_data[2] = { struct sc_asn1_entry c_asn1_update_data[2] = {
{ "updateData", SC_ASN1_STRUCT, SC_ASN1_TAG_SEQUENCE | SC_ASN1_APP | SC_ASN1_CONS, 0, NULL, NULL }, { "updateData", SC_ASN1_STRUCT, SC_ASN1_TAG_SEQUENCE | SC_ASN1_APP | SC_ASN1_CONS, 0, NULL, NULL },
{ NULL, 0, 0, 0, NULL, NULL } { NULL, 0, 0, 0, NULL, NULL }
}; };
struct sc_asn1_entry asn1_field_value[4], asn1_sdo_field[2], asn1_class_data[2], asn1_update_data[2]; struct sc_asn1_entry asn1_field_value[4], asn1_sdo_field[2], asn1_class_data[2], asn1_update_data[2];
@ -1036,14 +1037,14 @@ iasecc_sdo_encode_update_field(struct sc_context *ctx, unsigned char sdo_class,
rv = sc_asn1_encode(ctx, asn1_update_data, out, &out_len); rv = sc_asn1_encode(ctx, asn1_update_data, out, &out_len);
LOG_TEST_RET(ctx, rv, "Encode update data error"); LOG_TEST_RET(ctx, rv, "Encode update data error");
sc_debug(ctx, SC_LOG_DEBUG_ASN1,"Data: %s", sc_dump_hex(tlv->value, tlv->size)); sc_debug(ctx, SC_LOG_DEBUG_ASN1,"Data: %s", sc_dump_hex(tlv->value, tlv->size));
sc_debug(ctx, SC_LOG_DEBUG_ASN1,"Encoded: %s", sc_dump_hex(*out, out_len)); sc_debug(ctx, SC_LOG_DEBUG_ASN1,"Encoded: %s", sc_dump_hex(*out, out_len));
LOG_FUNC_RETURN(ctx, out_len); LOG_FUNC_RETURN(ctx, out_len);
} }
int int
iasecc_sdo_encode_rsa_update(struct sc_context *ctx, struct iasecc_sdo *sdo, struct sc_pkcs15_prkey_rsa *rsa, iasecc_sdo_encode_rsa_update(struct sc_context *ctx, struct iasecc_sdo *sdo, struct sc_pkcs15_prkey_rsa *rsa,
struct iasecc_sdo_update *sdo_update) struct iasecc_sdo_update *sdo_update)
{ {
@ -1055,7 +1056,7 @@ iasecc_sdo_encode_rsa_update(struct sc_context *ctx, struct iasecc_sdo *sdo, str
int indx = 0; int indx = 0;
sc_log(ctx, "iasecc_sdo_encode_rsa_update(IASECC_SDO_CLASS_RSA_PRIVATE)"); sc_log(ctx, "iasecc_sdo_encode_rsa_update(IASECC_SDO_CLASS_RSA_PRIVATE)");
if (!rsa->p.len || !rsa->q.len || !rsa->iqmp.len || !rsa->dmp1.len || !rsa->dmq1.len) if (!rsa->p.len || !rsa->q.len || !rsa->iqmp.len || !rsa->dmp1.len || !rsa->dmq1.len)
LOG_TEST_RET(ctx, SC_ERROR_INVALID_DATA, "need all private RSA key components"); LOG_TEST_RET(ctx, SC_ERROR_INVALID_DATA, "need all private RSA key components");
sdo_update->magic = SC_CARDCTL_IASECC_SDO_MAGIC_PUT_DATA; sdo_update->magic = SC_CARDCTL_IASECC_SDO_MAGIC_PUT_DATA;
@ -1096,7 +1097,7 @@ iasecc_sdo_encode_rsa_update(struct sc_context *ctx, struct iasecc_sdo *sdo, str
sc_log(ctx, "prv_key.compulsory.on_card %i", sdo->data.prv_key.compulsory.on_card); sc_log(ctx, "prv_key.compulsory.on_card %i", sdo->data.prv_key.compulsory.on_card);
if (!sdo->data.prv_key.compulsory.on_card) { if (!sdo->data.prv_key.compulsory.on_card) {
if (sdo->data.prv_key.compulsory.value) { if (sdo->data.prv_key.compulsory.value) {
sc_log(ctx, "sdo_prvkey->data.prv_key.compulsory.size %i", sdo->data.prv_key.compulsory.size); sc_log(ctx, "sdo_prvkey->data.prv_key.compulsory.size %i", sdo->data.prv_key.compulsory.size);
sdo_update->fields[indx].parent_tag = IASECC_SDO_PRVKEY_TAG; sdo_update->fields[indx].parent_tag = IASECC_SDO_PRVKEY_TAG;
sdo_update->fields[indx].tag = IASECC_SDO_PRVKEY_TAG_COMPULSORY; sdo_update->fields[indx].tag = IASECC_SDO_PRVKEY_TAG_COMPULSORY;
sdo_update->fields[indx].value = sdo->data.prv_key.compulsory.value; sdo_update->fields[indx].value = sdo->data.prv_key.compulsory.value;
@ -1145,7 +1146,7 @@ iasecc_sdo_encode_rsa_update(struct sc_context *ctx, struct iasecc_sdo *sdo, str
indx++; indx++;
} }
/* For ECC card 'compulsory' flag should be already here */ /* For ECC card 'compulsory' flag should be already here */
if (!sdo->data.pub_key.compulsory.on_card) { if (!sdo->data.pub_key.compulsory.on_card) {
if (sdo->data.pub_key.compulsory.value) { if (sdo->data.pub_key.compulsory.value) {
sdo_update->fields[indx].parent_tag = IASECC_SDO_PUBKEY_TAG; sdo_update->fields[indx].parent_tag = IASECC_SDO_PUBKEY_TAG;
@ -1222,7 +1223,7 @@ iasecc_sdo_parse_card_answer(struct sc_context *ctx, unsigned char *data, size_t
static int static int
iasecc_tlv_copy(struct sc_context *ctx, struct iasecc_extended_tlv *in, struct iasecc_extended_tlv *out) iasecc_tlv_copy(struct sc_context *ctx, struct iasecc_extended_tlv *in, struct iasecc_extended_tlv *out)
{ {
if (!in || !out) if (!in || !out)
LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS); LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_ARGUMENTS);
memset(out, 0, sizeof(struct iasecc_extended_tlv)); memset(out, 0, sizeof(struct iasecc_extended_tlv));
@ -1233,7 +1234,7 @@ iasecc_tlv_copy(struct sc_context *ctx, struct iasecc_extended_tlv *in, struct i
out->value = calloc(1, in->size); out->value = calloc(1, in->size);
if (!out->value) if (!out->value)
LOG_FUNC_RETURN(ctx, SC_ERROR_OUT_OF_MEMORY); LOG_FUNC_RETURN(ctx, SC_ERROR_OUT_OF_MEMORY);
memcpy(out->value, in->value, in->size); memcpy(out->value, in->value, in->size);
out->size = in->size; out->size = in->size;
} }
@ -1286,4 +1287,4 @@ iasecc_docp_copy(struct sc_context *ctx, struct iasecc_sdo_docp *in, struct iase
LOG_FUNC_RETURN(ctx, SC_SUCCESS); LOG_FUNC_RETURN(ctx, SC_SUCCESS);
} }
#endif /* ENABLE_OPENSSL */ #endif /* ENABLE_OPENSSL */

4
src/libopensc/iasecc-sdo.h
View File

@ -154,7 +154,7 @@
#define IASECC_SDO_TAGS_UPDATE_MAX 16 #define IASECC_SDO_TAGS_UPDATE_MAX 16
#define IASECC_SE_CRTS_MAX 24 //#define IASECC_SE_CRTS_MAX 24
#define _MAKE_IASECC_SDO_MAGIC(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | ((d))) #define _MAKE_IASECC_SDO_MAGIC(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | ((d)))
@ -163,7 +163,7 @@
#define IASECC_SDO_MAGIC_UPDATE_RSA _MAKE_IASECC_SDO_MAGIC('E', 'C', 'U', 'R') #define IASECC_SDO_MAGIC_UPDATE_RSA _MAKE_IASECC_SDO_MAGIC('E', 'C', 'U', 'R')
#define IASECC_MAX_SCBS 7 #define IASECC_MAX_SCBS 7
#define IASECC_MAX_CRTS_IN_SE 24 //#define IASECC_MAX_CRTS_IN_SE 24
struct iasecc_extended_tlv { struct iasecc_extended_tlv {
unsigned tag; unsigned tag;

2
src/tools/iasecc-tool.c
View File

@ -147,7 +147,7 @@ static int list_sdos(char *sdo_tag)
if (!rv) { if (!rv) {
printf("Found SE #%X\n", se.reference); printf("Found SE #%X\n", se.reference);
_iasecc_print_docp(&se.docp); _iasecc_print_docp(&se.docp);
for(jj=0; jj<IASECC_SE_CRTS_MAX && se.crts[jj].tag; jj++) for(jj=0; jj<SC_MAX_CRTS_IN_SE && se.crts[jj].tag; jj++)
_iasecc_print_crt(&se.crts[jj]); _iasecc_print_crt(&se.crts[jj]);
} }
} }