Merge "Fix crash of osp-security-service" into tizen_2.1

diff --git a/inc/CertificateServiceStub.h b/inc/CertificateServiceStub.h
old mode 100644 (file)
new mode 100755 (executable)
index 2d2a5a3..32d6892
--- a/inc/CertificateServiceStub.h
+++ b/inc/CertificateServiceStub.h
@@ -86,7 +86,7 @@ public:
 
        bool OnInsertCertificateChainWithPrivateKey(Tizen::Io::_IpcBuffer certChainPrivateKeyBufferIpc, int certChainPrivateKeyLength, result* pRet);
 
-       bool OnInstallPkcs12Content(Tizen::Io::_IpcBuffer pkcs12FilePath, Tizen::Io::_IpcBuffer pkcs12ImportPassword, result* pRet);
+       bool OnInstallPkcs12Content(Tizen::Io::_IpcBuffer pkcs12FilePath, Tizen::Io::_IpcBuffer pkcs12ImportPassword, bool checkPrivilege, result* pRet);
 
        bool OnDeleteUserCertChainByCertId(int certID, result* pRet);
 

diff --git a/src/CertificateServiceStub.cpp b/src/CertificateServiceStub.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 9b3aa9f..c322b8f
--- a/src/CertificateServiceStub.cpp
+++ b/src/CertificateServiceStub.cpp
@@ -205,12 +205,15 @@ _CertServiceStub::OnInsertCertificateChainWithPrivateKey(Tizen::Io::_IpcBuffer c
 }
 
 bool
-_CertServiceStub::OnInstallPkcs12Content(Tizen::Io::_IpcBuffer pkcs12FilePath, Tizen::Io::_IpcBuffer pkcs12ImportPassword, result* pRet)
+_CertServiceStub::OnInstallPkcs12Content(Tizen::Io::_IpcBuffer pkcs12FilePath, Tizen::Io::_IpcBuffer pkcs12ImportPassword, bool checkPrivilege, result* pRet)
 {
        result r = E_SUCCESS;
 
-       *pRet = _AccessController::CheckSystemPrivilege(__pIpcServer->GetClientAppId(), _PRV_CERTIFICATE_WRITE);
-       TryCatchResult(!IsFailed(*pRet), *pRet = E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
+       if(checkPrivilege == true)
+       {
+               *pRet = _AccessController::CheckSystemPrivilege(__pIpcServer->GetClientAppId(), _PRV_CERTIFICATE_WRITE);
+               TryCatchResult(!IsFailed(*pRet), *pRet = E_PRIVILEGE_DENIED, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
+       }
 
        *pRet = _CertServer::InsertPkcs12Content(static_cast< char* >(pkcs12FilePath.pBuffer), static_cast< char* >(pkcs12ImportPassword.pBuffer));