getAttribute; apdu class

src/CMakeLists.txt

@@ -13,5 +13,5 @@ set(SOURCE_FILES
   DataAccess/ScReader.cpp
   include/ScReader.h
   include/ScReader.hxx)
-add_library(pcsc_cpptools SHARED ${SOURCE_FILES} include/ScHex.h DBO/ScHex.cpp)
+add_library(pcsc_cpptools SHARED ${SOURCE_FILES} include/ScHex.h DBO/ScHex.cpp include/ScApduCommand.h DBO/ScApduCommand.cpp)
 target_link_libraries(pcsc_cpptools pcsclite)

src/DBO/ScApduCommand.cpp

@@ -0,0 +1,5 @@
+//
+// Created by robin on 6/30/15.
+//
+
+#include "ScApduCommand.h"

src/DataAccess/ScReader.cpp

@@ -5,6 +5,7 @@
 #include <winscard.h>
 #include <vector>
 #include <string.h>
+#include <reader.h>
 #include "ScReader.h"
 
 thread_local LPSCARDCONTEXT ScReader::_context = nullptr;
@@ -98,3 +99,33 @@ LONG ScReader::getLastResult()
 {
     return _lastResult;
 }
+
+std::string ScReader::getAttribute(DWORD attr)
+{
+    DWORD len = SCARD_AUTOALLOCATE;
+    BYTE* data = nullptr;
+    _lastResult = SCardGetAttrib(*_card, attr, (BYTE*)&data, &len);
+    if (_lastResult == SCARD_S_SUCCESS)
+        return std::string((char*)data, len);
+    return std::string();
+}
+
+std::string ScReader::getAtr()
+{
+    return getAttribute(SCARD_ATTR_ATR_STRING);
+}
+
+std::string ScReader::getResultString(const LONG& error)
+{
+    return pcsc_stringify_error(error);
+}
+
+std::string ScReader::getLastStaticResultString()
+{
+    return getResultString(_lastStaticResult);
+}
+
+std::string ScReader::getLastResultString()
+{
+    return getResultString(_lastResult);
+}

src/include/ScApduCommand.h

@@ -0,0 +1,29 @@
+//
+// Created by robin on 6/30/15.
+//
+
+#ifndef PCSC_CPPTOOLS_SCADPUCOMMAND_H
+# define PCSC_CPPTOOLS_SCADPUCOMMAND_H
+
+# include <string>
+
+class ScApduCommand
+{
+
+private:
+    char _cla;
+
+    char _ins;
+
+    char _p1;
+
+    char _p2;
+
+    char _lc;
+
+    std::string _data;
+
+    char _le;
+};
+
+#endif //PCSC_CPPTOOLS_SCADPUCOMMAND_H

src/include/ScReader.h

@@ -23,8 +23,14 @@ public:
 
     static LONG getLastStaticResult();
 
+    static std::string getLastStaticResultString();
+
+    static std::string getResultString(const LONG& result);
+
     LONG getLastResult();
 
+    std::string getLastResultString();
+
     static bool establishContext();
 
     static bool freeContext();
@@ -38,6 +44,10 @@ public:
 
     inline const std::string getName() const;
 
+    std::string getAttribute(DWORD attr);
+
+    std::string getAtr();
+
 private:
     std::string _name;
 

tests/test_pcsc_cpp_tools.cpp

@@ -44,6 +44,8 @@ TEST(Reader, Test1)
     }
     auto reader = readers[0];
     ASSERT_TRUE(reader->connect());
+    std::cout << "ATR: " << ScHex::byteArrayToString(reader->getAtr())
+        << " Result: " << reader->getLastResultString() << std::endl;
     auto res = reader->transmit(ScBasicCommand("94 A4 00 00 02 20 00 00"));
     ASSERT_NE(nullptr, res->getData().data());
     auto resp = ScHex::byteArrayToString(res->getData());