Merge pull request #679 from l1k/master
GemSAFE ATR + format string fixes
This commit is contained in:
commit
ceb913a7bb
|
@ -63,6 +63,8 @@ static struct sc_atr_table gemsafe_atrs[] = {
|
||||||
{"3B:7D:95:00:00:80:31:80:65:B0:83:11:00:C8:83:00:90:00", NULL, NULL, SC_CARD_TYPE_GEMSAFEV1_PTEID, 0, NULL},
|
{"3B:7D:95:00:00:80:31:80:65:B0:83:11:00:C8:83:00:90:00", NULL, NULL, SC_CARD_TYPE_GEMSAFEV1_PTEID, 0, NULL},
|
||||||
/* Swedish eID card */
|
/* Swedish eID card */
|
||||||
{"3B:7D:96:00:00:80:31:80:65:B0:83:11:00:C8:83:00:90:00", NULL, NULL, SC_CARD_TYPE_GEMSAFEV1_SEEID, 0, NULL},
|
{"3B:7D:96:00:00:80:31:80:65:B0:83:11:00:C8:83:00:90:00", NULL, NULL, SC_CARD_TYPE_GEMSAFEV1_SEEID, 0, NULL},
|
||||||
|
/* European Patent Office epoline card*/
|
||||||
|
{"3b:7d:96:00:00:80:31:80:65:b0:83:02:01:f3:83:00:90:00", NULL, NULL, SC_CARD_TYPE_GEMSAFEV1_SEEID, 0, NULL},
|
||||||
{NULL, NULL, NULL, 0, 0, NULL}
|
{NULL, NULL, NULL, 0, 0, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -415,7 +415,7 @@ sc_pkcs11_signature_update(sc_pkcs11_operation_t *operation,
|
||||||
LOG_FUNC_RETURN(context, CKR_DATA_LEN_RANGE);
|
LOG_FUNC_RETURN(context, CKR_DATA_LEN_RANGE);
|
||||||
memcpy(data->buffer + data->buffer_len, pPart, ulPartLen);
|
memcpy(data->buffer + data->buffer_len, pPart, ulPartLen);
|
||||||
data->buffer_len += ulPartLen;
|
data->buffer_len += ulPartLen;
|
||||||
sc_log(context, "data length %li", data->buffer_len);
|
sc_log(context, "data length %u", data->buffer_len);
|
||||||
LOG_FUNC_RETURN(context, CKR_OK);
|
LOG_FUNC_RETURN(context, CKR_OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -428,7 +428,7 @@ sc_pkcs11_signature_final(sc_pkcs11_operation_t *operation,
|
||||||
|
|
||||||
LOG_FUNC_CALLED(context);
|
LOG_FUNC_CALLED(context);
|
||||||
data = (struct signature_data *) operation->priv_data;
|
data = (struct signature_data *) operation->priv_data;
|
||||||
sc_log(context, "data length %li", data->buffer_len);
|
sc_log(context, "data length %u", data->buffer_len);
|
||||||
if (data->md) {
|
if (data->md) {
|
||||||
sc_pkcs11_operation_t *md = data->md;
|
sc_pkcs11_operation_t *md = data->md;
|
||||||
CK_ULONG len = sizeof(data->buffer);
|
CK_ULONG len = sizeof(data->buffer);
|
||||||
|
@ -441,7 +441,7 @@ sc_pkcs11_signature_final(sc_pkcs11_operation_t *operation,
|
||||||
data->buffer_len = len;
|
data->buffer_len = len;
|
||||||
}
|
}
|
||||||
|
|
||||||
sc_log(context, "%li bytes to sign", data->buffer_len);
|
sc_log(context, "%u bytes to sign", data->buffer_len);
|
||||||
rv = data->key->ops->sign(operation->session, data->key, &operation->mechanism,
|
rv = data->key->ops->sign(operation->session, data->key, &operation->mechanism,
|
||||||
data->buffer, data->buffer_len, pSignature, pulSignatureLen);
|
data->buffer, data->buffer_len, pSignature, pulSignatureLen);
|
||||||
LOG_FUNC_RETURN(context, rv);
|
LOG_FUNC_RETURN(context, rv);
|
||||||
|
|
Loading…
Reference in New Issue