diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 078da13e5..f232c35ed 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -1153,6 +1153,10 @@ void iClass_ReadCheck(uint8_t blockno, uint8_t keytype) {
 // which needs to authenticate before doing more things like read/write
 // selects and authenticate to a card,  sends back div_key and mac to client.
 void iClass_Authentication(uint8_t *bytes) {
+    iclass_auth(bytes, true, NULL);
+}
+
+bool iclass_auth(uint8_t *bytes, bool send_reply, uint8_t *dataout) {
 
     struct p {
         uint8_t key[8];
@@ -1176,8 +1180,10 @@ void iClass_Authentication(uint8_t *bytes) {
 
     packet.isOK = select_iclass_tag(card_data, payload->use_credit_key, &eof_time);
     if (packet.isOK == false) {
-        reply_ng(CMD_HF_ICLASS_AUTH, PM3_ESOFT, (uint8_t *)&packet, sizeof(packet));
-        return;
+        if (send_reply)
+            reply_ng(CMD_HF_ICLASS_AUTH, PM3_ESOFT, (uint8_t *)&packet, sizeof(packet));
+
+        return false;
     }
     uint32_t start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
     
@@ -1201,7 +1207,15 @@ void iClass_Authentication(uint8_t *bytes) {
     uint8_t resp[ICLASS_BUFFER_SIZE];
     packet.isOK = iclass_send_cmd_with_retries(check, sizeof(check), resp, sizeof(resp), 4, 3, start_time, ICLASS_READER_TIMEOUT_OTHERS, &eof_time);
     
-    reply_ng(CMD_HF_ICLASS_AUTH, (packet.isOK)? PM3_SUCCESS : PM3_ESOFT, (uint8_t *)&packet, sizeof(packet));
+    if (send_reply)
+        reply_ng(CMD_HF_ICLASS_AUTH, (packet.isOK)? PM3_SUCCESS : PM3_ESOFT, (uint8_t *)&packet, sizeof(packet));
+    
+    if (dataout) {
+        memcpy(dataout, card_data, sizeof(card_data));
+        memcpy(dataout + (3 * 8), packet.div_key, sizeof(packet.div_key));
+    }
+
+    return true;
 }
 
 typedef struct iclass_premac {
@@ -1300,7 +1314,7 @@ out:
 
 // Tries to read block.
 // retries 10times.
-static bool iclass_readblock(uint8_t blockno, uint8_t *data) {
+bool iclass_readblock(uint8_t blockno, uint8_t *data) {
     uint8_t resp[10];
     uint8_t c[] = {ICLASS_CMD_READ_OR_IDENTIFY, blockno, 0x00, 0x00};
     AddCrc(c + 1, 1);
diff --git a/armsrc/iclass.h b/armsrc/iclass.h
index 3b4de40f0..fa256c925 100644
--- a/armsrc/iclass.h
+++ b/armsrc/iclass.h
@@ -16,17 +16,20 @@
 void SniffIClass(uint8_t jam_search_len, uint8_t *jam_search_string);
 void ReaderIClass(uint8_t arg0);
 void ReaderIClass_Replay(uint8_t arg0, uint8_t *mac);
-void iClass_Authentication(uint8_t *mac);
-void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain);
+
 void iClass_WriteBlock(uint8_t blockno, uint8_t *data);
-void iClass_ReadBlk(uint8_t blockno);
 void iClass_Dump(uint8_t blockno, uint8_t numblks);
 void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data);
 void iClass_ReadCheck(uint8_t blockno, uint8_t keytype);
 
-
 int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf);
-
 void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain);
 void iclass_simulate(uint8_t sim_type, uint8_t num_csns, bool send_reply, uint8_t *datain, uint8_t *dataout,  uint16_t *dataoutlen);
+
+void iClass_Authentication_fast(uint64_t arg0, uint64_t arg1, uint8_t *datain);
+void iClass_Authentication(uint8_t *bytes);
+bool iclass_auth(uint8_t *bytes, bool send_reply, uint8_t *dataout);
+
+void iClass_ReadBlk(uint8_t blockno);
+bool iclass_readblock(uint8_t blockno, uint8_t *data);
 #endif