github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

armsrc/sam_common.c: fix sam_append_asn1_node

Browse source
This commit is contained in:
Jakub Kramarz 2025-01-05 20:42:32 +01:00
commit 472d2e9330
2 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
armsrc/sam_common.c
View file

@ -327,31 +327,34 @@ uint8_t * sam_find_asn1_node(uint8_t * root, const uint8_t type){
return NULL; return NULL;
} }
// /** /**
// * @brief Appends an ASN.1 node to the end of a given node. * @brief Appends an ASN.1 node to the end of a given node.
// * *
// * This function appends an ASN.1 node of a specified type and length to the end of * This function appends an ASN.1 node of a specified type and length to the end of
// * the ASN.1 structure at specified node level. * the ASN.1 structure at specified node level.
// * It would make the code cleaner, but I can't get it to work - it calculates fields lengths incorrectly. *
// * * It is the most naive solution that does not handle the case where the node to append is
// * @param root Pointer to the root node of the ASN.1 structure. * not the last node at the same level. It also does not also care about proper
// * @param root Pointer to the node to be appended of the ASN.1 structure. * order of the nodes.
// * @param type The type of the ASN.1 node to append. *
// * @param data Pointer to the data to be appended. * @param root Pointer to the root node of the ASN.1 structure.
// * @param len The length of the data to be appended. * @param root Pointer to the node to be appended of the ASN.1 structure.
// */ * @param type The type of the ASN.1 node to append.
// void sam_append_asn1_node(uint8_t * root, uint8_t * node, uint8_t type, uint8_t * data, uint8_t len){ * @param data Pointer to the data to be appended.
// uint8_t * end = root + *(root+1); * @param len The length of the data to be appended.
*/
void sam_append_asn1_node(uint8_t * root, uint8_t * node, uint8_t type, uint8_t * data, uint8_t len){
uint8_t * end = root + *(root+1) + 2;
// *(end) = type; *(end) = type;
// *(end+1) = len; *(end+1) = len;
// memcpy(end+2, data, len); memcpy(end+2, data, len);
// for(uint8_t * current = root; current < node; current += 2){ for(uint8_t * current = root; current <= node; current += 2){
// *(current+1) += 2 + len; *(current+1) += 2 + len;
// }; };
// return; return;
// } }
void sam_send_ack(void){ void sam_send_ack(void){
uint8_t * response = BigBuf_malloc(ISO7816_MAX_FRAME); uint8_t * response = BigBuf_malloc(ISO7816_MAX_FRAME);

2
armsrc/sam_common.h
View file

@ -42,7 +42,7 @@ int sam_send_payload(
int sam_get_version(void); int sam_get_version(void);
uint8_t * sam_find_asn1_node(uint8_t * root, const uint8_t type); uint8_t * sam_find_asn1_node(uint8_t * root, const uint8_t type);
//void sam_append_asn1_node(uint8_t * root, uint8_t * node, uint8_t type, uint8_t * data, uint8_t len); void sam_append_asn1_node(uint8_t * root, uint8_t * node, uint8_t type, uint8_t * data, uint8_t len);
void sam_send_ack(void); void sam_send_ack(void);