diff --git a/client/src/mifare/desfiretest.c b/client/src/mifare/desfiretest.c
index 268fb1383..83697cfb7 100644
--- a/client/src/mifare/desfiretest.c
+++ b/client/src/mifare/desfiretest.c
@@ -808,10 +808,31 @@ static bool TestLRPCMAC(void) {
     LRPSetKey(&ctx, key2, 0, true);
     uint8_t data2[] = {0xA4, 0x43, 0x4D, 0x74, 0x0C, 0x2C, 0xB6, 0x65, 0xFE, 0x53, 0x96, 0x95, 0x91, 0x89, 0x38, 0x3F};
     LRPCMAC(&ctx, data2, sizeof(data2), cmac);
-    uint8_t cmacres2[] = {0xA4, 0x43, 0x4D, 0x74, 0x0C, 0x2C, 0xB6, 0x65, 0xFE, 0x53, 0x96, 0x95, 0x91, 0x89, 0x38, 0x3F};
+    uint8_t cmacres2[] = {0x8B, 0x43, 0xAD, 0xF7, 0x67, 0xE4, 0x6B, 0x69, 0x2E, 0x8F, 0x24, 0xE8, 0x37, 0xCB, 0x5E, 0xFC};
     res = res && (memcmp(cmac, cmacres2, sizeof(cmacres2)) == 0);
 */
+    uint8_t key3[] = {0x0D, 0x46, 0x55, 0x75, 0x50, 0xCB, 0x31, 0x3F, 0x36, 0xAF, 0xBA, 0x87, 0x62, 0x5D, 0x96, 0x1A};
+    LRPSetKey(&ctx, key3, 0, true);
+    uint8_t data3[] = {0x90};
+    LRPCMAC(&ctx, data3, sizeof(data3), cmac);
+    uint8_t cmacres3[] = {0xF7, 0xC8, 0x55, 0x3D, 0xED, 0x57, 0x48, 0x29, 0xE6, 0xEE, 0x68, 0x11, 0x2C, 0xB3, 0x81, 0x7B};
+    res = res && (memcmp(cmac, cmacres3, sizeof(cmacres3)) == 0);
 
+    /*uint8_t key4[] = {0x2A, 0x47, 0x3E, 0x38, 0xBB, 0xF4, 0x53, 0x7C, 0x53, 0x97, 0xF4, 0x5A, 0xE4, 0x98, 0xCD, 0x4D};
+    LRPSetKey(&ctx, key4, 0, true);
+    uint8_t data4[] = {0xC2, 0xAC, 0x3D, 0x72, 0x50, 0xEE, 0xF0, 0x23, 0x18, 0xBC, 0x08, 0x4F, 0x29, 0x4B, 0x1A, 0xC7,
+                       0x22, 0x91, 0xEE, 0x1D, 0xC0, 0x2A, 0xF4, 0x24, 0x94, 0x1C, 0xAA, 0xC6, 0x85, 0xFC, 0xA5, 0x9D,
+                       0x90, 0x08, 0x67, 0x9B, 0x00, 0xC5, 0x6A, 0x05, 0x62, 0x58, 0x3B, 0xDA, 0xEC, 0x0B, 0xBA};
+    LRPCMAC(&ctx, data4, sizeof(data4), cmac);
+    uint8_t cmacres4[] = {0x66, 0xDC, 0x2B, 0xCE, 0x26, 0x9B, 0x79, 0x3B, 0x4A, 0xCA, 0x1A, 0x4D, 0x04, 0xDD, 0xD6, 0x68};
+    res = res && (memcmp(cmac, cmacres4, sizeof(cmacres4)) == 0);
+*/
+    uint8_t key5[] = {0x63, 0xA0, 0x16, 0x9B, 0x4D, 0x9F, 0xE4, 0x2C, 0x72, 0xB2, 0x78, 0x4C, 0x80, 0x6E, 0xAC, 0x21};
+    LRPSetKey(&ctx, key5, 0, true);
+    LRPCMAC(&ctx, NULL, 0, cmac);
+    uint8_t cmacres5[] = {0x0E, 0x07, 0xC6, 0x01, 0x97, 0x08, 0x14, 0xA4, 0x17, 0x6F, 0xDA, 0x63, 0x3C, 0x6F, 0xC3, 0xDE};
+    res = res && (memcmp(cmac, cmacres5, sizeof(cmacres5)) == 0);
+    
     if (res)
         PrintAndLogEx(INFO, "LRP CMAC.......... " _GREEN_("passed"));
     else
diff --git a/client/src/mifare/lrpcrypto.c b/client/src/mifare/lrpcrypto.c
index 0e55b3ca8..ba5a917d0 100644
--- a/client/src/mifare/lrpcrypto.c
+++ b/client/src/mifare/lrpcrypto.c
@@ -218,6 +218,7 @@ void LRPGenSubkeys(uint8_t *key, uint8_t *sk1, uint8_t *sk2) {
 
     uint8_t y[CRYPTO_AES128_KEY_SIZE] = {0};
     LRPEvalLRP(&ctx, const00, CRYPTO_AES128_KEY_SIZE * 2, true, y);
+PrintAndLogEx(ERR, "--k %s", sprint_hex(key, 16));    
 PrintAndLogEx(ERR, "--y %s", sprint_hex(y, 16));    
     mulPolyX(y);
     memcpy(sk1, y, CRYPTO_AES128_KEY_SIZE);
@@ -243,19 +244,22 @@ void LRPCMAC(LRPContext *ctx, uint8_t *data, size_t datalen, uint8_t *cmac) {
     }
 
     size_t bllen = datalen - clen;
-    // padding
-    if (bllen > 0) {
+
+PrintAndLogEx(ERR, "--bllen %d", bllen);    
+PrintAndLogEx(ERR, "--y %s", sprint_hex(y, 16));    
+    // if there is more data
+    if (bllen == 16) {
+        bin_xor(y, sk1, CRYPTO_AES128_KEY_SIZE);
+    } else {
+        // padding
         uint8_t bl[CRYPTO_AES128_KEY_SIZE] = {0};
         memcpy(bl, &data[clen * CRYPTO_AES128_KEY_SIZE], bllen);
         bl[bllen] = 0x80;
         bin_xor(y, bl, CRYPTO_AES128_KEY_SIZE);
-    }
 
-    // if there is more data
-    if (bllen == 0)
-        bin_xor(y, sk1, CRYPTO_AES128_KEY_SIZE);
-    else
         bin_xor(y, sk2, CRYPTO_AES128_KEY_SIZE);
+    }
     
     LRPEvalLRP(ctx, y, CRYPTO_AES128_KEY_SIZE * 2, true, cmac);
+PrintAndLogEx(ERR, "--cmac %s", sprint_hex(cmac, 16));    
 }