From 4b8c80ec33dd48eba9e7cc8edad4f0b311332a79 Mon Sep 17 00:00:00 2001
From: iceman1001 <herrmann1001@gmail.com>
Date: Tue, 27 Aug 2019 21:56:03 +0200
Subject: [PATCH] return values..

---
 client/loclass/cipher.c      |  7 +++----
 client/loclass/cipher.h      |  1 +
 client/loclass/cipherutils.c | 11 +++++++----
 client/loclass/cipherutils.h |  1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/client/loclass/cipher.c b/client/loclass/cipher.c
index 931f0c845..13f686b51 100644
--- a/client/loclass/cipher.c
+++ b/client/loclass/cipher.c
@@ -226,8 +226,8 @@ void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4]) {
     reverse_arraybytes(dest, sizeof(dest));
     memcpy(mac, dest, 4);
     //free(cc_nr);
-    return;
 }
+
 void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_key_p, uint8_t mac[4]) {
     uint8_t *address_data;
     uint8_t div_key[8];
@@ -245,7 +245,6 @@ void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_ke
     reverse_arraybytes(dest, sizeof(dest));
     memcpy(mac, dest, 4);
     free(address_data);
-    return;
 }
 
 #ifndef ON_DEVICE
@@ -267,8 +266,8 @@ int testMAC() {
         PrintAndLogEx(FAILED, "FAILED: MAC calculation failed:");
         printarr("    Calculated_MAC", calculated_mac, 4);
         printarr("    Correct_MAC   ", correct_MAC, 4);
-        return 1;
+        return PM3_ESOFT;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 #endif
diff --git a/client/loclass/cipher.h b/client/loclass/cipher.h
index b79dc47cd..7b1257aa5 100644
--- a/client/loclass/cipher.h
+++ b/client/loclass/cipher.h
@@ -39,6 +39,7 @@
 #ifndef CIPHER_H
 #define CIPHER_H
 #include <stdint.h>
+#include "pm3_cmd.h"
 
 void doMAC(uint8_t *cc_nr_p, uint8_t *div_key_p, uint8_t mac[4]);
 void doMAC_N(uint8_t *address_data_p, uint8_t address_data_size, uint8_t *div_key_p, uint8_t mac[4]);
diff --git a/client/loclass/cipherutils.c b/client/loclass/cipherutils.c
index ee440fb73..b50268697 100644
--- a/client/loclass/cipherutils.c
+++ b/client/loclass/cipherutils.c
@@ -127,18 +127,21 @@ uint64_t x_bytes_to_num(uint8_t *src, size_t len) {
     }
     return num;
 }
+
 uint8_t reversebytes(uint8_t b) {
     b = (b & 0xF0) >> 4 | (b & 0x0F) << 4;
     b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
     b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
     return b;
 }
+
 void reverse_arraybytes(uint8_t *arr, size_t len) {
     uint8_t i;
     for (i = 0; i < len ; i++) {
         arr[i] = reversebytes(arr[i]);
     }
 }
+
 void reverse_arraycopy(uint8_t *arr, uint8_t *dest, size_t len) {
     uint8_t i;
     for (i = 0; i < len ; i++) {
@@ -202,9 +205,9 @@ static int testBitStream() {
         for (i = 0 ; i < ARRAYLEN(input) ; i++) {
             PrintAndLogEx(NORMAL, "    IN %02x, OUT %02x", input[i], output[i]);
         }
-        return 1;
+        return PM3_ESOFT;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 static int testReversedBitstream() {
@@ -232,9 +235,9 @@ static int testReversedBitstream() {
         for (i = 0 ; i < ARRAYLEN(input) ; i++) {
             PrintAndLogEx(NORMAL, "    IN %02x, MIDDLE: %02x, OUT %02x", input[i], reverse[i], output[i]);
         }
-        return 1;
+        return PM3_ESOFT;
     }
-    return 0;
+    return PM3_SUCCESS;
 }
 
 
diff --git a/client/loclass/cipherutils.h b/client/loclass/cipherutils.h
index 70438d33b..6c90326a6 100644
--- a/client/loclass/cipherutils.h
+++ b/client/loclass/cipherutils.h
@@ -41,6 +41,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include "pm3_cmd.h"
 
 typedef struct {
     uint8_t *buffer;