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

pkcs15: throw an error if there is no valid public key data 

Thanks to Nguyen Hong Quan.
http://www.opensc-project.org/pipermail/opensc-devel/2012-May/017997.html

Change-Id: I48bc6664909ca324ef71a2a10d9fddb9096ae598
This commit is contained in:
Viktor Tarasov 2012-05-05 14:49:21 +02:00
parent 66aa2b3896
commit 5d1feb3051
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libopensc/pkcs15-pubkey.c
View File

@ -613,7 +613,7 @@ sc_pkcs15_read_pubkey(struct sc_pkcs15_card *p15card,
struct sc_context *ctx = p15card->card->ctx;
const struct sc_pkcs15_pubkey_info *info;
struct sc_pkcs15_pubkey *pubkey;
u8 *data;
unsigned char *data = NULL;
size_t len;
int algorithm, r;
@ -649,6 +649,9 @@ sc_pkcs15_read_pubkey(struct sc_pkcs15_card *p15card,
else {
r = sc_pkcs15_read_file(p15card, &info->path, &data, &len);
SC_TEST_RET(ctx, SC_LOG_DEBUG_NORMAL, r, "Failed to read public key file.");
if (!data || !len)
LOG_TEST_RET(ctx, SC_ERROR_DATA_OBJECT_NOT_FOUND, "Empty public key file.");
}
pubkey = calloc(1, sizeof(struct sc_pkcs15_pubkey));