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

openpgp: Check return code of OID decoding from ASN1

This commit is contained in:
Jakub Jelen 2020-03-27 11:11:08 +01:00
parent 8c4d325576
commit 9bd139d1e4
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libopensc/pkcs15-openpgp.c
View File

@ -306,7 +306,14 @@ sc_pkcs15emu_openpgp_init(sc_pkcs15_card_t *p15card)
prkey_obj.auth_id.value[0] = key_cfg[i].prkey_pin;
/* need to get size from algorithms using oid */
r = sc_asn1_decode_object_id(&cxdata[1], cxdata_len-1, &oid);
if (cxdata[0] == SC_OPENPGP_KEYALGO_ECDH ||
cxdata[0] == SC_OPENPGP_KEYALGO_ECDSA ||
cxdata[0] == SC_OPENPGP_KEYALGO_EDDSA) {
r = sc_asn1_decode_object_id(&cxdata[1], cxdata_len-1, &oid);
if (r != SC_SUCCESS) {
sc_log(ctx, "Failed to parse OID for elliptic curve algorithm");
}
}
switch (cxdata[0]) {
case SC_OPENPGP_KEYALGO_ECDSA:
@ -407,7 +414,14 @@ sc_pkcs15emu_openpgp_init(sc_pkcs15_card_t *p15card)
strlcpy(pubkey_obj.label, key_cfg[i].label, sizeof(pubkey_obj.label));
pubkey_obj.flags = SC_PKCS15_CO_FLAG_MODIFIABLE;
r = sc_asn1_decode_object_id(&cxdata[1], cxdata_len-1, &oid);
if (cxdata[0] == SC_OPENPGP_KEYALGO_ECDH ||
cxdata[0] == SC_OPENPGP_KEYALGO_ECDSA ||
cxdata[0] == SC_OPENPGP_KEYALGO_EDDSA) {
r = sc_asn1_decode_object_id(&cxdata[1], cxdata_len-1, &oid);
if (r != SC_SUCCESS) {
sc_log(ctx, "Failed to parse OID for elliptic curve algorithm");
}
}
switch (cxdata[0]) {
case SC_OPENPGP_KEYALGO_ECDSA: