- // EV1/NTAG size key
- datalen = param_gethex(Cmd, cmdp+1, data, 8);
- if ( !datalen ) {
- memcpy(authenticationkey, data, 4);
- cmdp += 2;
- hasAuthKey = true;
- break;
- }
- // UL-C size key
- datalen = param_gethex(Cmd, cmdp+1, data, 32);
- if (!datalen){
- memcpy(authenticationkey, data, 16);
- cmdp += 2;
- hasAuthKey = true;
- break;
- }
+ dataLen = param_getstr(Cmd, cmdp+1, tempStr);
+ if (dataLen == 32 || dataLen == 8) { //ul-c or ev1/ntag key length
+ errors = param_gethex(tempStr, 0, authenticationkey, dataLen);
+ dataLen /= 2; // handled as bytes from now on
+ } else {
+ PrintAndLog("\nERROR: Key is incorrect length\n");