summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWonkyu Kwon <wonkyu.kwon@samsung.com>2013-07-24 17:34:05 +0900
committerWonkyu Kwon <wonkyu.kwon@samsung.com>2013-07-24 17:56:39 +0900
commitc8abe04674199023daad7f3572427c6fb6432a09 (patch)
tree8fa361a320394263cd68ad17ec0e5a594780d53e
parent2d7e06a991f6d03ab2229e85185cd7f0090dc739 (diff)
downloadsmartcard-service-c8abe04674199023daad7f3572427c6fb6432a09.tar.gz
smartcard-service-c8abe04674199023daad7f3572427c6fb6432a09.tar.bz2
smartcard-service-c8abe04674199023daad7f3572427c6fb6432a09.zip
Remove unused code
Change-Id: If662e14618f5297b7b99a748951de169d2a9058c
-rw-r--r--client/SEService.cpp2
-rw-r--r--common/AccessCondition.cpp43
-rw-r--r--common/AccessControlList.cpp18
-rw-r--r--common/GPARAACL.cpp2
-rw-r--r--common/GPARFACL.cpp1
-rw-r--r--common/include/AccessCondition.h5
-rw-r--r--common/include/AccessControlList.h2
-rw-r--r--server/ServerResource.cpp2
-rw-r--r--server/ServerSEService.cpp2
9 files changed, 0 insertions, 77 deletions
diff --git a/client/SEService.cpp b/client/SEService.cpp
index c54dd4c..b97d9b9 100644
--- a/client/SEService.cpp
+++ b/client/SEService.cpp
@@ -449,8 +449,6 @@ namespace smartcard_service_api
count = g_variant_iter_n_children(iter);
while (g_variant_iter_loop(iter, "(us)", &handle, &name) == true)
{
- SECURE_LOGD("Reader : name [%s], handle [%08x]", name, handle);
-
/* add readers */
reader = new Reader((void *)this->handle, name, GUINT_TO_POINTER(handle));
if (reader == NULL)
diff --git a/common/AccessCondition.cpp b/common/AccessCondition.cpp
index 5fd66ea..10593d5 100644
--- a/common/AccessCondition.cpp
+++ b/common/AccessCondition.cpp
@@ -69,27 +69,6 @@ namespace smartcard_service_api
return result;
}
- void AccessRule::printAccessRules() const
- {
- if (listFilters.size() > 0)
- {
- vector<pair<ByteArray, ByteArray> >::const_iterator item;
-
- _DBG(" +---- Granted APDUs");
-
- for (item = listFilters.begin(); item != listFilters.end(); item++)
- {
- _DBG(" +----- APDU : %s, Mask : %s", item->first.toString().c_str(), item->second.toString().c_str());
- }
- }
- else
- {
- _DBG(" +---- APDU Access ALLOW : %s", apduRule ? "ALWAYS" : "NEVER");
- }
-
- _DBG(" +---- NFC Access ALLOW : %s", nfcRule ? "ALWAYS" : "NEVER");
- }
-
bool AccessRule::isAuthorizedNFCAccess(void) const
{
return nfcRule;
@@ -142,28 +121,6 @@ namespace smartcard_service_api
return result;
}
- void AccessCondition::printAccessConditions() const
- {
- _DBG(" +-- Access Condition");
-
- if (mapRules.size() > 0)
- {
- map<ByteArray, AccessRule>::const_iterator item;
-
- for (item = mapRules.begin(); item != mapRules.end(); item++)
- {
- ByteArray temp = item->first;
-
- _DBG(" +--- hash : %s", (temp == AccessControlList::ALL_DEVICE_APPS) ? "All device applications" : temp.toString().c_str());
- item->second.printAccessRules();
- }
- }
- else
- {
- _DBG(" +--- permission : %s", permission ? "granted all" : "denied all");
- }
- }
-
void AccessCondition::setAPDUAccessRule(const ByteArray &certHash,
bool rule)
{
diff --git a/common/AccessControlList.cpp b/common/AccessControlList.cpp
index 0233360..2122eed 100644
--- a/common/AccessControlList.cpp
+++ b/common/AccessControlList.cpp
@@ -221,22 +221,4 @@ END :
END :
return result;
}
-
- void AccessControlList::printAccessControlList() const
- {
- ByteArray temp;
- map<ByteArray, AccessCondition>::const_iterator iterMap;
-
- _DBG("========================== Access Control Rules ============================");
- for (iterMap = mapConditions.begin(); iterMap != mapConditions.end(); iterMap++)
- {
- temp = iterMap->first;
-
- _DBG("+ aid : %s", (temp == DEFAULT_SE_APP) ? "Default Application" : (temp == ALL_SE_APPS) ? "All SE Applications" : temp.toString().c_str());
-
- iterMap->second.printAccessConditions();
- }
- _DBG("============================================================================");
- }
-
} /* namespace smartcard_service_api */
diff --git a/common/GPARAACL.cpp b/common/GPARAACL.cpp
index 95a9f65..31c082d 100644
--- a/common/GPARAACL.cpp
+++ b/common/GPARAACL.cpp
@@ -292,8 +292,6 @@ namespace smartcard_service_api
{
_INFO("access rules are not changed. skip update");
}
-
- printAccessControlList();
} else {
_ERR("transmitSync failed, %x", result);
}
diff --git a/common/GPARFACL.cpp b/common/GPARFACL.cpp
index 71cb37a..a136c83 100644
--- a/common/GPARFACL.cpp
+++ b/common/GPARFACL.cpp
@@ -77,7 +77,6 @@ namespace smartcard_service_api
result = loadAccessControl(channel, dodf);
if (result == SCARD_ERROR_OK)
{
- printAccessControlList();
}
else
{
diff --git a/common/include/AccessCondition.h b/common/include/AccessCondition.h
index ca1f4af..787bdd0 100644
--- a/common/include/AccessCondition.h
+++ b/common/include/AccessCondition.h
@@ -37,8 +37,6 @@ namespace smartcard_service_api
bool nfcRule;
vector<pair<ByteArray, ByteArray> > listFilters;
- void printAccessRules() const;
-
public :
AccessRule() : apduRule(true), nfcRule(true) {}
@@ -65,8 +63,6 @@ namespace smartcard_service_api
ByteArray aid;
map<ByteArray, AccessRule> mapRules;
- void printAccessConditions() const;
-
public :
AccessCondition() : permission(false) {}
@@ -91,7 +87,6 @@ namespace smartcard_service_api
AccessRule *getAccessRule(const ByteArray &certHash);
const AccessRule *getAccessRule(const ByteArray &certHash) const;
-
friend class AccessControlList;
};
diff --git a/common/include/AccessControlList.h b/common/include/AccessControlList.h
index f87e309..df98c75 100644
--- a/common/include/AccessControlList.h
+++ b/common/include/AccessControlList.h
@@ -42,8 +42,6 @@ namespace smartcard_service_api
const ByteArray &hash) const;
AccessCondition &getAccessCondition(const ByteArray &aid);
- void printAccessControlList() const;
-
public:
static ByteArray ALL_SE_APPS;
static ByteArray DEFAULT_SE_APP;
diff --git a/server/ServerResource.cpp b/server/ServerResource.cpp
index 1f093a0..63c7d2f 100644
--- a/server/ServerResource.cpp
+++ b/server/ServerResource.cpp
@@ -1202,8 +1202,6 @@ namespace smartcard_service_api
snprintf(fullPath, sizeof(fullPath),
"%s/%s", OMAPI_SE_PATH, entry->d_name);
- SCARD_DEBUG("se name [%s]", fullPath);
-
result = appendSELibrary(fullPath);
}
}
diff --git a/server/ServerSEService.cpp b/server/ServerSEService.cpp
index dc878e9..cc4fc5c 100644
--- a/server/ServerSEService.cpp
+++ b/server/ServerSEService.cpp
@@ -158,8 +158,6 @@ namespace smartcard_service_api
snprintf(fullPath, sizeof(fullPath), "%s/%s", OMAPI_SE_PATH, entry->d_name);
- SCARD_DEBUG("se name [%s]", fullPath);
-
result = appendSELibrary(fullPath);
}
}