added sectorDbo

cli/Interface/MainClass.cpp

@@ -64,16 +64,20 @@ int MainClass::main()
         auto tag = tags.getData()[i];
         std::cout << "UID: " << tag->getUid() << std::endl;
         std::cout << "Type: " << tag->getType() << std::endl;
-        for(int i = 0; i < 16; ++i) {
-            std::cout << "+Sector: " << i << std::endl;
-            for (int j = 0; j < 4; ++j) {
-                auto sector = tag->readBlock(i, j, StringUtils::humanToRaw("8829da9daf76").getData(), MFC_KEY_A);
-                if (!sector) {
-                    sector.print();
-                }
-                else {
-                    std::cout << StringUtils::rawToHuman(sector.getData()) << std::endl;
+        for(int s = 0; s < 16; ++s) {
+            std::cout << "+Sector: " << s << std::endl;
+            auto sectorResult = tag->readSector(s,  StringUtils::humanToRaw("8829da9daf76").getData(), MFC_KEY_A);
+            if (!sectorResult) {
+                sectorResult.print();
+            }
+            else {
+                auto sector = sectorResult.getData();
+                for (int b = 0; b < 3; ++b) {
+                    std::cout << StringUtils::rawToHuman(sector.getBlock(b)) << std::endl;
                 }
+                std::cout << StringUtils::rawToHuman(sector.getKeyA()) << " "
+                << StringUtils::rawToHuman(sector.getAccessBits()) << " "
+                << StringUtils::rawToHuman(sector.getKeyB()) << std::endl;
             }
         }
     }

src/Business/FreeFareTagBusiness.cpp

@@ -19,7 +19,7 @@ ResultString FreeFareTagBusiness::readBlock(int sector, int block, std::string k
     return _tag->readBlock(sector, block, key, keyType);
 }
 
-ResultString FreeFareTagBusiness::readSector(int sector, std::string key, int keyType)
+Result<SectorDbo> FreeFareTagBusiness::readSector(int sector, std::string key, int keyType)
 {
     std::string res;
     int lastBlock = _tag->getSectorBlockCount(sector);
@@ -29,10 +29,10 @@ ResultString FreeFareTagBusiness::readSector(int sector, std::string key, int ke
             res += data.getData();
         }
         else {
-            return data;
+            return Result<SectorDbo>::error(data);
         }
     }
-    return ResultString::ok(res);
+    return SectorDbo::parse(res);
 }
 
 const std::string &FreeFareTagBusiness::getUid() const

src/Business/FreeFareTagBusiness.h

@@ -8,6 +8,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <DataAccess/FreeFareTag.h>
+#include <DataAccess/SectorDbo.h>
 
 class FreeFareTagBusiness
 {
@@ -18,7 +19,7 @@ public:
 
     ResultString readBlock(int sector, int block, std::string key, int keyType);
 
-    ResultString readSector(int sector, std::string key, int keyType);
+    Result<SectorDbo> readSector(int sector, std::string key, int keyType);
 
     const std::string & getUid() const;
 

src/CMakeLists.txt

@@ -11,7 +11,7 @@ set(SOURCE_FILES
         DataAccess/FreeFareDevice.h
         DataAccess/FreeFareTag.cpp
         DataAccess/FreeFareTag.h
-        DBO/StringUtils.cpp DBO/StringUtils.h DBO/AccessBitsDbo.cpp DBO/AccessBitsDbo.h Business/LibNfcBusiness.cpp Business/LibNfcBusiness.h Business/NfcDeviceBusiness.cpp Business/NfcDeviceBusiness.h Business/FreeFareDeviceBusiness.cpp Business/FreeFareDeviceBusiness.h Business/FreeFareTagBusiness.cpp Business/FreeFareTagBusiness.h)
+        DBO/StringUtils.cpp DBO/StringUtils.h DBO/AccessBitsDbo.cpp DBO/AccessBitsDbo.h Business/LibNfcBusiness.cpp Business/LibNfcBusiness.h Business/NfcDeviceBusiness.cpp Business/NfcDeviceBusiness.h Business/FreeFareDeviceBusiness.cpp Business/FreeFareDeviceBusiness.h Business/FreeFareTagBusiness.cpp Business/FreeFareTagBusiness.h DataAccess/SectorDbo.cpp DataAccess/SectorDbo.h)
 
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} ${LIBS})

src/DataAccess/SectorDbo.cpp

@@ -0,0 +1,37 @@
+//
+// Created by robin on 7/22/16.
+//
+
+#include "SectorDbo.h"
+
+Result<SectorDbo> SectorDbo::parse(std::string data)
+{
+    if (data.length() != 64) {
+        return Result<SectorDbo>::error("Data length must be 64");
+    }
+    SectorDbo dbo;
+    for (int i = 0; i < 4; ++i) {
+        dbo._blocks[i] = data.substr(16 * i, 16);
+    }
+    return Result<SectorDbo>::ok(dbo);
+}
+
+const std::string &SectorDbo::getBlock(int block) const
+{
+    return _blocks[block];
+}
+
+std::string SectorDbo::getKeyA() const
+{
+    return _blocks[3].substr(0, 6);
+}
+
+std::string SectorDbo::getKeyB() const
+{
+    return _blocks[3].substr(10, 6);
+}
+
+std::string SectorDbo::getAccessBits() const
+{
+    return _blocks[3].substr(6, 4);
+}

src/DataAccess/SectorDbo.h

@@ -0,0 +1,31 @@
+//
+// Created by robin on 7/22/16.
+//
+
+#ifndef MIFARE_TOOLS_SECTORDBO_H
+#define MIFARE_TOOLS_SECTORDBO_H
+
+
+#include <string>
+#include <DBO/Result.h>
+
+class SectorDbo
+{
+public:
+
+    const std::string& getBlock(int block) const;
+
+    std::string getKeyA() const;
+
+    std::string getKeyB() const;
+
+    std::string getAccessBits() const;
+
+    static Result<SectorDbo> parse(std::string data);
+
+protected:
+    std::string _blocks[4];
+};
+
+
+#endif //MIFARE_TOOLS_SECTORDBO_H