From 24ef79eca4d6a6f32dd213fba681d12b4d6a0a71 Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Fri, 8 Jan 2010 16:34:43 +0000 Subject: [PATCH] fix mifare_classic_get_uid(). --- libfreefare/mifare_classic.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libfreefare/mifare_classic.c b/libfreefare/mifare_classic.c index 844fba8..bdda4e6 100644 --- a/libfreefare/mifare_classic.c +++ b/libfreefare/mifare_classic.c @@ -706,13 +706,7 @@ char* mifare_classic_get_uid(MifareClassicTag tag) { char* uid = malloc((4 * 2) + 1); - for( uint8_t i = 0; i < 4; i++) { - unsigned char msb = (tag->info.abtUid[i] | 0xf0) >> 4; - unsigned char lsb = (tag->info.abtUid[i] | 0x0f); - - uid[i] = msb < 9 ? msb + '0' : msb + 'a'; - uid[i+1] = lsb < 9 ? lsb + '0' : lsb + 'a'; - } + snprintf(uid, 9, "%02x%02x%02x%02x", tag->info.abtUid[0], tag->info.abtUid[1], tag->info.abtUid[2], tag->info.abtUid[3]); uid[8] = '\0'; return uid; }