diff options
author | hb.min <hb.min@samsung.com> | 2012-11-15 16:54:01 +0900 |
---|---|---|
committer | hb.min <hb.min@samsung.com> | 2012-11-15 16:54:01 +0900 |
commit | 5185f5e44456ec4a020c70300e5404bfce81d9b8 (patch) | |
tree | 317532305ccef0957cd6e19ce3847a3f92d7c92b /src | |
parent | 7362faf542bf6dafc6c59f2883141f8f23afedb9 (diff) | |
download | installer-5185f5e44456ec4a020c70300e5404bfce81d9b8.tar.gz installer-5185f5e44456ec4a020c70300e5404bfce81d9b8.tar.bz2 installer-5185f5e44456ec4a020c70300e5404bfce81d9b8.zip |
Add visibility check routine
Change-Id: Iccc9a266275e381fdc566820b99c7dbe8853d368
Diffstat (limited to 'src')
-rwxr-xr-x | src/Step/SignatureStep.cpp | 2 | ||||
-rwxr-xr-x | src/XmlHandler/PrivilegeHandler.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Step/SignatureStep.cpp b/src/Step/SignatureStep.cpp index 745e653..c6e7d7a 100755 --- a/src/Step/SignatureStep.cpp +++ b/src/Step/SignatureStep.cpp @@ -193,7 +193,7 @@ SignatureStep::OnStateRootCert(void) AppLogTag(OSP_INSTALLER, "AppId = [%ls], CertType = [%d], ApiVisibility = [%d]", appId.GetPointer(), certType, apiVisibility); - r = PrivilegeHandler::GenerateCipherPrivilege(appId, *pPrivilegeList, certType, privileges, hmacPrivileges); + r = PrivilegeHandler::GenerateCipherPrivilege(appId, *pPrivilegeList, apiVisibility, privileges, hmacPrivileges); if (IsFailed(r)) { fprintf(stderr, "PrivilegeHandler::GenerateCipherPrivilege is failded. [%ls][%ls][%ls]\n", appId.GetPointer(), privileges.GetPointer(), hmacPrivileges.GetPointer()); diff --git a/src/XmlHandler/PrivilegeHandler.cpp b/src/XmlHandler/PrivilegeHandler.cpp index 9f8c216..75a4872 100755 --- a/src/XmlHandler/PrivilegeHandler.cpp +++ b/src/XmlHandler/PrivilegeHandler.cpp @@ -26,6 +26,7 @@ #include <FSecCryptoAesCipher.h> #include <FSecCryptoSha1Hmac.h> #include <FBase_StringConverter.h> +#include <FBaseInternalTypes.h> #include <FSec_AccessControlTypes.h> #include <FSec_DeviceKeyGenerator.h> @@ -230,7 +231,7 @@ PrivilegeHandler::PackPrivilegeN(const IList& privilegeList, int visibilityLevel validStringFlag = true; privilegeEnum = static_cast< int >(privilegeListTable[index].privilege); - if (visibilityLevel != _VSB_LEVEL_NONE) + if (visibilityLevel != _API_VISIBILITY_NONE) { if (visibilityLevelListTable[privilegeEnum][_PRV_API_VER_3_0] > visibilityLevel) { @@ -254,7 +255,7 @@ PrivilegeHandler::PackPrivilegeN(const IList& privilegeList, int visibilityLevel if (validLevelFlag == false) { - SysLogException(NID_SEC, E_INVALID_ARG, "[E_INVALID_ARG] The application does not have the privilege to register %ls", pTempString->GetPointer()); + SysLogException(NID_SEC, E_INVALID_ARG, "[E_INVALID_ARG] The application does not have the visibility to register %ls", pTempString->GetPointer()); resultFlag = false; } } |