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

fix #425: guid computation issue 

Compilation without OpenSSL - guid computation issue
This case is triggered when:
- built without OpenSSL
- called from a minidriver where id.len = 1
- card number is less than 15 bytes

(VTA: codding style slightly touched)
This commit is contained in:
vletoux 2015-04-06 16:43:17 +02:00 committed by Viktor Tarasov
parent 4000e6d5b0
commit ce962c14f4
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libopensc/pkcs15.c
View File

@ -2697,7 +2697,7 @@ sc_pkcs15_get_object_guid(struct sc_pkcs15_card *p15card, const struct sc_pkcs15
struct sc_serial_number serialnr;
struct sc_pkcs15_id id;
unsigned char guid_bin[SC_PKCS15_MAX_ID_SIZE + SC_MAX_SERIALNR];
int rv;
int rv, guid_bin_size;
LOG_FUNC_CALLED(ctx);
if(!out || !out_size)
@ -2748,23 +2748,34 @@ sc_pkcs15_get_object_guid(struct sc_pkcs15_card *p15card, const struct sc_pkcs15
memset(guid_bin, 0, sizeof(guid_bin));
memcpy(guid_bin, id.value, id.len);
memcpy(guid_bin + id.len, serialnr.value, serialnr.len);
guid_bin_size = id.len + serialnr.len;
// If OpenSSL is available (SHA1), then rather use the hash of the data
// - this also protects against data being too short
/*
* If OpenSSL is available (SHA1), then rather use the hash of the data
* - this also protects against data being too short
*/
#ifdef ENABLE_OPENSSL
SHA1(guid_bin, id.len + serialnr.len, guid_bin);
id.len = SHA_DIGEST_LENGTH;
serialnr.len = 0;
SHA1(guid_bin, guid_bin_size, guid_bin);
guid_bin_size = SHA_DIGEST_LENGTH;
#else
/* If guid_bin has a size larger than 16 bytes
* force the remaining bytes up to 16 bytes to be zero
* so sc_pkcs15_serialize_guid won't fail because the size is less than 16
*/
if (guid_bin_size < 16)
guid_bin_size = 16;
#endif
rv = sc_pkcs15_serialize_guid(guid_bin, id.len + serialnr.len, flags, (char *)out, *out_size);
rv = sc_pkcs15_serialize_guid(guid_bin, guid_bin_size, flags, (char *)out, *out_size);
LOG_TEST_RET(ctx, rv, "Serialize GUID error");
*out_size = strlen((char *)out);
LOG_FUNC_RETURN(ctx, rv);
}
void sc_pkcs15_free_key_params(struct sc_pkcs15_key_params *params)
void
sc_pkcs15_free_key_params(struct sc_pkcs15_key_params *params)
{
if (!params)
return;