Fix checking error value

Change-Id: I0dd9c4c549f93284bbba2172ae884538dffb1938

diff --git a/common/EFDIR.cpp b/common/EFDIR.cpp
index bc78a1833ccb139c85f44e83e430c7e14902f77b..32b9e55c9f21714184e0ae305f069ef5edbaf155 100644 (file)
--- a/common/EFDIR.cpp
+++ b/common/EFDIR.cpp
@@ -34,7 +34,7 @@ namespace smartcard_service_api
                int ret;
 
                ret = select(dirPath, false);
-               if (ret == FileObject::SUCCESS)
+               if (ret >= SCARD_ERROR_OK)
                {
                        _DBG("response : %s", selectResponse.toString());
                }

diff --git a/common/PKCS15.cpp b/common/PKCS15.cpp
index ce9729b90e76ae424f66e3623ec6137dce51bf4c..6b4d0c7430ad5b8520466b548ae153d37b188772 100644 (file)
--- a/common/PKCS15.cpp
+++ b/common/PKCS15.cpp
@@ -36,7 +36,7 @@ namespace smartcard_service_api
                int ret;
 
                ret = select(PKCS15::PKCS15_AID);
-               if (ret == FileObject::SUCCESS)
+               if (ret >= SCARD_ERROR_OK)
                {
                        _DBG("response : %s", selectResponse.toString());
                }
@@ -85,7 +85,7 @@ namespace smartcard_service_api
                        int ret;
 
                        ret = select(path, false);
-                       if (ret == FileObject::SUCCESS)
+                       if (ret >= SCARD_ERROR_OK)
                        {
                                result = true;
                        }

diff --git a/common/PKCS15DODF.cpp b/common/PKCS15DODF.cpp
index 12fad2fab81c568abc1a679e0bcc8c58df80c932..e3d504f62f659f708ea77eb061de5e25e530f961 100644 (file)
--- a/common/PKCS15DODF.cpp
+++ b/common/PKCS15DODF.cpp
@@ -34,7 +34,7 @@ namespace smartcard_service_api
        {
                int ret = 0;
 
-               if ((ret = select(fid)) == 0)
+               if ((ret = select(fid)) >= SCARD_ERROR_OK)
                {
                        ByteArray dodfData, extra;
 
@@ -61,7 +61,7 @@ namespace smartcard_service_api
        {
                int ret = 0;
 
-               if ((ret = select(path)) == 0)
+               if ((ret = select(path)) >= SCARD_ERROR_OK)
                {
                        ByteArray dodfData, extra;
 

diff --git a/common/PKCS15ODF.cpp b/common/PKCS15ODF.cpp
index 362634d05d76d58622ecd868300e0d1b6e7b6df0..84c95908d9c031dea6ead06308d46ca8eea3e632 100644 (file)
--- a/common/PKCS15ODF.cpp
+++ b/common/PKCS15ODF.cpp
@@ -31,7 +31,7 @@ namespace smartcard_service_api
        {
                int ret = 0;
 
-               if ((ret = select(PKCS15ODF::ODF_FID)) == 0)
+               if ((ret = select(PKCS15ODF::ODF_FID)) >= SCARD_ERROR_OK)
                {
                        ByteArray odfData, extra;
 

diff --git a/server/ServerResource.cpp b/server/ServerResource.cpp
index f1048bca3f885b39ffd56de1f43d9c0b1d19ef90..93655088a8f44adabeb7473763c7f402d8612a6e 100644 (file)
--- a/server/ServerResource.cpp
+++ b/server/ServerResource.cpp
@@ -400,6 +400,8 @@ namespace smartcard_service_api
                {
                        PKCS15 pkcs15(channel);
 
+                       channel->setSelectResponse(pkcs15.getSelectResponse());
+
                        acList->loadACL(channel);
                        result = acList->isAuthorizedAccess(aid, hashes);
                }
@@ -543,7 +545,7 @@ namespace smartcard_service_api
                                FileObject file(channel);
 
                                rv = file.select(aid);
-                               if (rv >= 0)
+                               if (rv >= SCARD_ERROR_OK)
                                {
                                        /* remove privilege mode */
                                        channel->unsetPrivilegeMode();