begin read data

src/DataAccess/FreeFareTag.cpp

@@ -29,4 +29,66 @@ freefare_tag_type FreeFareTag::getType() const
 const std::string &FreeFareTag::getUid() const
 {
     return _uid;
+}
+
+ResultBool FreeFareTag::authenticate(int sector, std::string key, int keyType)
+{
+    if (mifare_classic_connect(_tag) != 0) {
+        return ResultBool::error("Failed to connect to MIFARE tag");
+    }
+
+    MifareClassicBlockNumber block = mifare_classic_sector_last_block((MifareClassicBlockNumber)sector);
+    if (mifare_classic_authenticate(_tag, block, (const unsigned char*)key.c_str(), (MifareClassicKeyType)keyType) != 0) {
+        return ResultBool::error("Failed to authenticate to MIFARE tag");
+    }
+
+    mifare_classic_disconnect(_tag);
+    return ResultBool::ok(true);
+}
+
+ResultString FreeFareTag::readSector(int sector, std::string key, int keyType)
+{
+    if (mifare_classic_connect(_tag) != 0) {
+        return ResultString::error("Failed to connect to MIFARE tag");
+    }
+
+    MifareClassicBlockNumber firstBlock = mifare_classic_sector_first_block((MifareClassicBlockNumber)sector);
+    MifareClassicBlockNumber lastBlock = mifare_classic_sector_last_block((MifareClassicBlockNumber)sector);
+    std::string allData;
+    for (MifareClassicBlockNumber block = firstBlock; block <= lastBlock; ++block) {
+        if (mifare_classic_authenticate(_tag, block, (const unsigned char *) key.c_str(),
+                                        (MifareClassicKeyType) keyType) != 0) {
+            return ResultString::error("Failed to authenticate to MIFARE tag");
+        }
+
+        MifareClassicBlock data;
+        if (mifare_classic_read(_tag, block, &data)) {
+            return ResultString::error("Failed to read MIFARE tag data");
+        }
+        allData += std::string((const char*)data, sizeof(data));
+    }
+
+    mifare_classic_disconnect(_tag);
+    return ResultString::ok(allData);
+}
+
+ResultString FreeFareTag::readBlock(int sector, int block, std::string key, int keyType)
+{
+    if (mifare_classic_connect(_tag) != 0) {
+        return ResultString::error("Failed to connect to MIFARE tag");
+    }
+
+    block = mifare_classic_sector_last_block((MifareClassicBlockNumber)sector) + block;
+    if (mifare_classic_authenticate(_tag, (MifareClassicBlockNumber)block, (const unsigned char*)key.c_str(),
+                                    (MifareClassicKeyType)keyType) != 0) {
+        return ResultString::error("Failed to authenticate to MIFARE tag");
+    }
+
+    MifareClassicBlock data;
+    if (mifare_classic_read(_tag, (MifareClassicBlockNumber)block, &data)) {
+        return ResultString::error("Failed to read MIFARE tag data");
+    }
+
+    mifare_classic_disconnect(_tag);
+    return ResultString::ok(std::string((const char*)data, sizeof(data)));
 }

src/DataAccess/FreeFareTag.h

@@ -7,13 +7,21 @@
 
 #include <freefare.h>
 #include <string>
+#include <DBO/Result.h>
 
 class FreeFareTag
 {
 public:
+
     FreeFareTag(FreefareTag tag);
     ~FreeFareTag();
 
+    ResultBool authenticate(int sector, std::string key, int keyType);
+
+    ResultString readSector(int sector, std::string key, int keyType);
+
+    ResultString readBlock(int sector, int block, std::string key, int keyType);
+
     const freefare_tag * getTag() const;
 
     freefare_tag_type getType() const;