github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-22 14:13:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ResultLen calculation

Browse source
This commit is contained in:
pwpiwi 2019-02-08 12:30:22 +01:00
commit ee7fd63c27
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/emv/emvcore.c
View file

@ -302,24 +302,23 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
if (APDULogging) if (APDULogging)
PrintAndLogEx(SUCCESS, ">>>> %s", sprint_hex(apdu, apdu_len)); PrintAndLogEx(SUCCESS, ">>>> %s", sprint_hex(apdu, apdu_len));
#ifdef WITH_SMARTCARD
switch(channel) { switch(channel) {
case ECC_CONTACTLESS: case ECC_CONTACTLESS:
// 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le(?IncludeLe) // 6 byes + data = INS + CLA + P1 + P2 + Lc + <data = Nc> + Le(?IncludeLe)
res = ExchangeAPDU14a(apdu, apdu_len, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen); res = ExchangeAPDU14a(apdu, apdu_len, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
if (res) {
return res;
}
break; break;
case ECC_CONTACT: case ECC_CONTACT:
//int ExchangeAPDUSC(uint8_t *datain, int datainlen, bool activateCard, bool leaveSignalON, uint8_t *dataout, int maxdataoutlen, int *dataoutlen);
#ifdef WITH_SMARTCARD
res = ExchangeAPDUSC(apdu, apdu_len, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen); res = ExchangeAPDUSC(apdu, apdu_len, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
break;
}
#else
res = ExchangeAPDU14a(apdu, apdu_len, ActivateField, LeaveFieldON, Result, (int)MaxResultLen, (int *)ResultLen);
#endif
if (res) { if (res) {
return res; return res;
} }
#endif
break;
}
if (APDULogging) if (APDULogging)
PrintAndLogEx(SUCCESS, "<<<< %s", sprint_hex(Result, *ResultLen)); PrintAndLogEx(SUCCESS, "<<<< %s", sprint_hex(Result, *ResultLen));
@ -331,10 +330,15 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
if (Result[*ResultLen-2] == 0x61) { if (Result[*ResultLen-2] == 0x61) {
uint8_t La = Result[*ResultLen-1]; uint8_t La = Result[*ResultLen-1];
uint8_t get_response[5] = {apdu[0], ISO7816_GET_RESPONSE, 0x00, 0x00, La}; uint8_t get_response[5] = {apdu[0], ISO7816_GET_RESPONSE, 0x00, 0x00, La};
return EMVExchangeEx(channel, false, LeaveFieldON, get_response, sizeof(get_response), &Result[*ResultLen-2], MaxResultLen-(*ResultLen-2), ResultLen, sw, tlv); size_t oldlen = *ResultLen-2;
res = EMVExchangeEx(channel, false, LeaveFieldON, get_response, sizeof(get_response), &Result[oldlen], MaxResultLen-oldlen, ResultLen, sw, tlv);
*ResultLen += oldlen;
} }
if (res) return res;
*ResultLen -= 2; *ResultLen -= 2;
isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1]; isw = Result[*ResultLen] * 0x0100 + Result[*ResultLen + 1];
if (sw) if (sw)
*sw = isw; *sw = isw;
@ -715,7 +719,7 @@ struct emv_pk *get_ca_pk(struct tlvdb *db) {
if (!df_tlv || !caidx_tlv || df_tlv->len < 6 || caidx_tlv->len != 1) if (!df_tlv || !caidx_tlv || df_tlv->len < 6 || caidx_tlv->len != 1)
return NULL; return NULL;
PrintAndLogEx(NORMAL, "CA public key index 0x%0x", caidx_tlv->value[0]); PrintAndLogEx(NORMAL, "CA Public Key index 0x%0x", caidx_tlv->value[0]);
return emv_pk_get_ca_pk(df_tlv->value, caidx_tlv->value[0]); return emv_pk_get_ca_pk(df_tlv->value, caidx_tlv->value[0]);
} }
@ -1035,7 +1039,7 @@ int trCDA(struct tlvdb *tlv, struct tlvdb *ac_tlv, struct tlv *pdol_data_tlv, st
struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv); struct emv_pk *icc_pk = emv_pki_recover_icc_cert(issuer_pk, tlv, sda_tlv);
if (!icc_pk) { if (!icc_pk) {
PrintAndLogEx(WARNING, "Error: ICC setrificate not found. Exit."); PrintAndLogEx(WARNING, "Error: ICC certificate not found. Exit.");
emv_pk_free(pk); emv_pk_free(pk);
emv_pk_free(issuer_pk); emv_pk_free(issuer_pk);
return 2; return 2;