Combine Signature Steps

StepCheckSignature and StepSaveSignature are combined

Related changes
    [app-installers] https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/203140/
    [tpk-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/tpk-backend/+/203141/
    [wgt-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/wgt-backend/+/203513/

Change-Id: Ie2e20c033f2663f08aab09e0f4810a19a6d4b174
Signed-off-by: ilho <ilho159.kim@samsung.com>

diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc
index a5ba89c8556f5dd8feb335d70d56b91bef57214d..fa5991509a0503e4a1f7298d9815551f503671fe 100644 (file)
--- a/src/tpk/tpk_installer.cc
+++ b/src/tpk/tpk_installer.cc
@@ -76,7 +76,6 @@
 #include <common/step/recovery/step_open_recovery_file.h>
 #include <common/step/recovery/step_create_recovery_file.h>
 #include <common/step/security/step_check_old_certificate.h>
-#include <common/step/security/step_check_signature.h>
 #include <common/step/security/step_get_privilege_level.h>
 #include <common/step/security/step_privacy_privilege.h>
 #include <common/step/security/step_privilege_compatibility.h>
@@ -86,7 +85,7 @@
 #include <common/step/security/step_revoke_security.h>
 #include <common/step/security/step_rollback_deinstallation_security.h>
 #include <common/step/security/step_rollback_installation_security.h>
-#include <common/step/security/step_save_signature.h>
+#include <common/step/security/step_signature.h>
 #include <common/step/security/step_update_security.h>
 #include <common/step/security/step_recover_trust_anchor.h>
 #include <common/step/security/step_register_trust_anchor.h>
@@ -138,8 +137,7 @@ void TpkInstaller::InstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<tpk::configuration::StepAdjustInstallLocation>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
@@ -181,8 +179,7 @@ void TpkInstaller::UpdateSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<tpk::configuration::StepAdjustInstallLocation>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
@@ -262,8 +259,7 @@ void TpkInstaller::ReinstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
   AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
@@ -315,8 +311,7 @@ void TpkInstaller::DeltaSteps() {
   AddStep<ci::filesystem::StepEnableExternalMount>();
   AddStep<ci::filesystem::StepDeltaPatch>();
   AddStep<ci::filesystem::StepDisableExternalMount>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<tpk::configuration::StepAdjustInstallLocation>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
@@ -401,8 +396,7 @@ void TpkInstaller::MountInstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<tpk::configuration::StepAdjustInstallLocation>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
@@ -444,8 +438,7 @@ void TpkInstaller::MountUpdateSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<tpk::configuration::StepAdjustInstallLocation>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
@@ -495,8 +488,7 @@ void TpkInstaller::ManifestDirectInstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<tpk::pkgmgr::StepConvertXml>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<tpk::configuration::StepAdjustInstallLocation>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
@@ -529,8 +521,7 @@ void TpkInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::mount::StepCheckMountPath>();
   AddStep<tpk::pkgmgr::StepConvertXml>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<tpk::pkgmgr::StepManifestAdjustment>();
   AddStep<tpk::configuration::StepAdjustInstallLocation>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
@@ -560,7 +551,7 @@ void TpkInstaller::ManifestPartialInstallSteps() {
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepCheckSignature>();
+  AddStep<ci::security::StepSignature>(false);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
   AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
@@ -583,7 +574,7 @@ void TpkInstaller::ManifestPartialUpdateSteps() {
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepCheckSignature>();
+  AddStep<ci::security::StepSignature>(false);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
   AddStep<tpk::security::StepCheckTpkBackgroundCategory>();
@@ -631,8 +622,7 @@ void TpkInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<tpk::configuration::StepAdjustInstallLocation>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
@@ -678,7 +668,7 @@ void TpkInstaller::ReadonlyUpdateUninstallSteps() {
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepCheckSignature>();
+  AddStep<ci::security::StepSignature>(false);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::TPK);
   AddStep<ci::configuration::StepSwitchReadonlyMode>();