CHG: lowered the number of bytes collected for T55xxReadBlock. Was 12000 -> 7679

[proxmark3-svn] / armsrc / tlv.c

#include <tlv.h>
#include <stddef.h>

int decode_ber_tlv_item(uint8_t* data, tlvtag* returnedtag)
{
    uint8_t tag[TAG_LENGTH] = {0x00,0x00};
    uint16_t length = 0;
    //uint8_t value[VALUE_LENGTH];
    uint8_t lenlen = 0;
    int i = 0; 
    int z = 0; 
    //decode tag
    tag[0] = data[0];
    if((tag[0] & TLV_TAG_NUMBER_MASK) == TLV_TAG_NUMBER_MASK) { //see subsequent bytes
        i++; 
        tag[i] = data[i];
        //assume tag is only two bytes long for now
        /*
        while((data[i] & TLV_TAG_MASK) == TLV_TAG_MASK){
            i++; 
            tag[i] = data[i];
        }
        */ 
    }
    i++; 
    //decode length
    if((data[i] & TLV_LENGTH_MASK) == TLV_LENGTH_MASK) {
        lenlen = data[i] ^ TLV_LENGTH_MASK;
        i++;
        length = (uint16_t)data[i];
        z = 1;
        while(z < lenlen){
            i++;
            z++;
            length <<= 8;
            length += (uint16_t)data[i];
        }
        i++;
    }
    else {
        length = (uint16_t)data[i];
        i++;
    }
    //copy results into the structure and return 
    memcpy(returnedtag->tag, tag, TAG_LENGTH);
    (*returnedtag).valuelength = length; //return length of tag value 
    (*returnedtag).fieldlength = length + i + 1; //return length of total field
    memcpy(returnedtag->value, &(data[i]), length);
    return 0; 
}

//generate a TLV tag off input data
int encode_ber_tlv_item(uint8_t* tag, uint8_t taglen, uint8_t* data, uint32_t datalen, uint8_t* outputtag, uint32_t* outputtaglen)
{
    if(!tag || !data || !outputtag || !outputtaglen) //null pointer check
        return 0;
    
    uint8_t datafieldlen = (datalen / 128) + 1; //field length of the tag
    uint8_t tlvtotallen = taglen + datafieldlen + datalen; //total length of the tag
    uint8_t returnedtag[tlvtotallen]; //buffer for the returned tag
    uint8_t counter = 0; 
    memcpy(returnedtag, tag, taglen); //copy tag into buffer
    counter += taglen; 
    if(datalen < 128){ // 1 byte length value
        returnedtag[counter++] = datalen; 
    } 
    else{
        returnedtag[counter++] = datafieldlen | 0x80; //high bit set and number of length bytes
        for(uint8_t i=datafieldlen; i !=0; i--){
            returnedtag[counter++] = (datalen >> (i * 8)) & 0xFF; //get current byte
        } 
    }
    memcpy(&returnedtag[counter], data, datalen);
    *outputtaglen = tlvtotallen;
    memcpy(outputtag, returnedtag,tlvtotallen);
    return 0;
}