Fix to store the select response

Change-Id: Icf3fcb1a9084302022d14ddac87c3d7d30af620f

diff --git a/common/FileObject.cpp b/common/FileObject.cpp
index e1d71f33005595ce3b2878dfac06d009897995e5..ce00b807265d3262c60f4783bd4d3a51554dcba3 100644 (file)
--- a/common/FileObject.cpp
+++ b/common/FileObject.cpp
@@ -50,7 +50,7 @@ namespace smartcard_service_api
                selectResponse.releaseBuffer();
        }
 
-       bool FileObject::setSelectResponse(ByteArray &response)
+       bool FileObject::setSelectResponse(ByteArray response)
        {
                bool result = false;
 

diff --git a/common/include/Channel.h b/common/include/Channel.h
index 2e0579f2973415b114c288ead7ee7f9902c8e58a..fda7386f76377fef8099eed874530309f483f6e8 100644 (file)
--- a/common/include/Channel.h
+++ b/common/include/Channel.h
@@ -41,10 +41,10 @@ namespace smartcard_service_api
                SessionHelper *session;
                int channelNum;
 
-               Channel() : Synchronous() { channelNum = -1; }
-               Channel(SessionHelper *session) : Synchronous() { this->session = session; }
+               Channel() : session(NULL), channelNum(-1) {}
+               Channel(SessionHelper *session) : session(session), channelNum(-1) {}
 
-               inline void setSelectResponse(ByteArray &response) { selectResponse = response; }
+               inline void setSelectResponse(ByteArray response) { selectResponse = response; }
 
        public :
                virtual ~Channel() {};

diff --git a/common/include/FileObject.h b/common/include/FileObject.h
index ec9e90b9505f3cd7494780b3d7ac7e0ad32fca62..55bd2f7a5a77863fdc5849508c9389be4290f876 100644 (file)
--- a/common/include/FileObject.h
+++ b/common/include/FileObject.h
@@ -43,7 +43,7 @@ namespace smartcard_service_api
 
        protected:
                ByteArray selectResponse;
-               bool setSelectResponse(ByteArray &response);
+               bool setSelectResponse(ByteArray response);
 
        public:
                static const int SUCCESS = 0;
@@ -68,6 +68,8 @@ namespace smartcard_service_api
                int select(unsigned int fid);
                int selectParent();
 
+               inline ByteArray getSelectResponse() { return selectResponse; }
+
                FCI *getFCI();
                FCP *getFCP();
 

diff --git a/server/ServerResource.cpp b/server/ServerResource.cpp
index 232fcdf097d213f6c5af2ea41388756befe4865e..f1048bca3f885b39ffd56de1f43d9c0b1d19ef90 100644 (file)
--- a/server/ServerResource.cpp
+++ b/server/ServerResource.cpp
@@ -528,6 +528,7 @@ namespace smartcard_service_api
                                {
                                        /* remove privilege mode */
                                        channel->unsetPrivilegeMode();
+                                       channel->setSelectResponse(pkcs15.getSelectResponse());
                                }
                                else
                                {
@@ -546,6 +547,7 @@ namespace smartcard_service_api
                                {
                                        /* remove privilege mode */
                                        channel->unsetPrivilegeMode();
+                                       channel->setSelectResponse(file.getSelectResponse());
                                }
                                else
                                {