map keys

cli/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(.)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -ggdb -g3")
 include_directories(. ../src)
 set(SOURCE_FILES
         main.cpp

cli/Interface/MainClass.cpp

@@ -8,7 +8,6 @@
 #include <Business/FreeFareDeviceBusiness.h>
 #include "DBO/Result.h"
 #include "Business/LibNfcBusiness.h"
-#include "Business/FreeFareDeviceBusiness.h"
 #include "CommandLineParser.h"
 #include "MainClass.h"
 
@@ -64,27 +63,62 @@ int MainClass::main()
         auto tag = tags.getData()[i];
         std::cout << "UID: " << tag->getUid() << std::endl;
         std::cout << "Type: " << tag->getType() << 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;
-            }
-        }
+        mapKeys(tag);
     }
 
     device->close();
-
     libNfc.clean();
 
     return 0;
 }
+
+int MainClass::mapKeys(std::shared_ptr<FreeFareTagBusiness> tag)
+{
+    std::vector<std::string> keys;
+    keys.push_back(StringUtils::humanToRaw("8829da9daf76").getData());
+    auto mappedKeysResult = tag->mapKeys(keys);
+    if (!mappedKeysResult) {
+        mappedKeysResult.print();
+    }
+    else {
+        auto mappedKeys = mappedKeysResult.getData();
+        for (int s = 0; s < mappedKeys.size(); ++s) {
+            auto sectorKeys = mappedKeys[s];
+            std::cout << "+Sector: " << s << std::endl;
+            for (int b = 0; b < sectorKeys.size(); ++b) {
+                auto blockKeys = sectorKeys[b];
+                std::cout << "+Block: " << b << std::endl;
+                std::cout << "Key A: " << StringUtils::rawToHuman(blockKeys.first) << std::endl;
+                std::cout << "Key B: " << StringUtils::rawToHuman(blockKeys.second) << std::endl;
+            }
+        }
+    }
+    return 0;
+}
+
+int MainClass::dump(std::shared_ptr<FreeFareTagBusiness> tag)
+{
+    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;
+        }
+    }
+    return 0;
+}
+
+

cli/Interface/MainClass.h

@@ -5,6 +5,8 @@
 #ifndef PDNS_SLAVE_MAINCLASS_H
 #define PDNS_SLAVE_MAINCLASS_H
 
+#include <memory>
+#include <Business/FreeFareTagBusiness.h>
 
 class MainClass {
 public:
@@ -12,6 +14,10 @@ public:
 
     int main();
 
+    int mapKeys(std::shared_ptr<FreeFareTagBusiness> tag);
+
+    int dump(std::shared_ptr<FreeFareTagBusiness> tag);
+
 private:
     int _argc;
 

src/Business/FreeFareTagBusiness.cpp

@@ -48,4 +48,30 @@ freefare_tag_type FreeFareTagBusiness::getType() const
 std::shared_ptr<FreeFareTag> FreeFareTagBusiness::getTag() const
 {
     return _tag;
+}
+
+Result<std::vector<std::vector<std::pair<std::string, std::string>>>> FreeFareTagBusiness::mapKeys(std::vector<std::string> keys)
+{
+    std::vector<std::vector<std::pair<std::string, std::string>>> mappedKeys;
+
+    for (int i = 0; i < 16; ++i) {
+        std::vector<std::pair<std::string, std::string>> sectorKeys;
+        for (int j = 0; j < 4; ++j) {
+            std::pair<std::string, std::string> blockKeys;
+            for (auto key : keys) {
+                auto res = authenticate(i, j, key, MFC_KEY_A);
+                if (res) {
+                    blockKeys.first = key;
+                }
+                res = authenticate(i, j, key, MFC_KEY_B);
+                if (res) {
+                    blockKeys.second = key;
+                }
+            }
+            sectorKeys.push_back(blockKeys);
+        }
+        mappedKeys.push_back(sectorKeys);
+    }
+
+    return Result<std::vector<std::vector<std::pair<std::string, std::string>>>>::ok(mappedKeys);
 }

src/Business/FreeFareTagBusiness.h

@@ -21,7 +21,9 @@ public:
 
     Result<SectorDbo> readSector(int sector, std::string key, int keyType);
 
-    const std::string & getUid() const;
+    Result<std::vector<std::vector<std::pair<std::string, std::string>>>> mapKeys(std::vector<std::string> keys);
+
+    const std::string& getUid() const;
 
     freefare_tag_type getType() const;
 

src/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(.)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11  -ggdb -g3")
 set(SOURCE_FILES
         DBO/Result.hxx
         DBO/Result.h

src/DataAccess/LibNfc.cpp

@@ -38,7 +38,7 @@ void LibNfc::clean()
 Result<std::vector<std::shared_ptr<NfcDevice>>> LibNfc::getDevices() const
 {
     nfc_connstring devices[16];
-    size_t count = nfc_list_devices(_context, devices, sizeof(devices));
+    size_t count = nfc_list_devices(_context, devices, 16);
     if (count < 0) {
         return Result<std::vector<std::shared_ptr<NfcDevice>>>::error("Failed to list NFC devices: " + count);
     }