Remove unused parameter

Change-Id: If497955cbd55ed8b7b09835dca4d5f9d242e55c6
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/common/certificate_validation.cc b/src/common/certificate_validation.cc
index e94d61d..9e1864a 100644 (file)
--- a/src/common/certificate_validation.cc
+++ b/src/common/certificate_validation.cc
@@ -191,7 +191,7 @@ bool CheckDistSignature(const ValidationCore::SignatureFileInfo& file_info) {
 
 bool ValidateSignatures(const bf::path& base_path,
     PrivilegeLevel* level, common_installer::CertificateInfo* cert_info,
-    bool check_reference, bool is_preload, std::string* error_message) {
+    bool check_reference, std::string* error_message) {
   // Find signature files
   ValidationCore::SignatureFileInfoSet signature_files;
   ValidationCore::SignatureFinder signature_finder(base_path.string());

diff --git a/src/common/certificate_validation.h b/src/common/certificate_validation.h
index fe34455..e257aa3 100644 (file)
--- a/src/common/certificate_validation.h
+++ b/src/common/certificate_validation.h
@@ -34,7 +34,7 @@ bool ValidateSignatureFile(
 
 bool ValidateSignatures(const boost::filesystem::path& base_path,
     PrivilegeLevel* level, common_installer::CertificateInfo* cert_info,
-    bool check_reference, bool is_preload, std::string* error_message);
+    bool check_reference, std::string* error_message);
 
 bool ValidatePrivilegeLevel(common_installer::PrivilegeLevel level,
     const std::string& app_type, const char* api_version, GList* privileges,

diff --git a/src/common/step/security/step_check_signature.cc b/src/common/step/security/step_check_signature.cc
index 9e2b3f8..ecd9c83 100644 (file)
--- a/src/common/step/security/step_check_signature.cc
+++ b/src/common/step/security/step_check_signature.cc
@@ -57,12 +57,11 @@ boost::filesystem::path StepCheckSignature::GetSignatureRoot() const {
 }
 
 Step::Status StepCheckSignature::CheckSignatures(bool check_reference,
-                                                 bool is_preload,
                                                  PrivilegeLevel* level) {
   std::string error_message;
   if (!ValidateSignatures(GetSignatureRoot(), level,
                          &context_->certificate_info.get(), check_reference,
-                         is_preload, &error_message)) {
+                         &error_message)) {
     on_error(Status::CERT_ERROR, error_message);
     return Status::CERT_ERROR;
   }
@@ -110,7 +109,7 @@ Step::Status StepCheckSignature::process() {
       context_->request_type.get() == ci::RequestType::ManifestDirectUpdate)))
     check_reference = false;
   bool is_preload = context_->is_preload_request.get();
-  Status status = CheckSignatures(check_reference, is_preload, &level);
+  Status status = CheckSignatures(check_reference, &level);
   if (status != Status::OK)
     return status;
 

diff --git a/src/common/step/security/step_check_signature.h b/src/common/step/security/step_check_signature.h
index 539b049..7d5ef52 100644 (file)
--- a/src/common/step/security/step_check_signature.h
+++ b/src/common/step/security/step_check_signature.h
@@ -48,8 +48,7 @@ class StepCheckSignature : public Step {
   virtual Status CheckPrivilegeLevel(PrivilegeLevel level);
 
  private:
-  Status CheckSignatures(bool check_reference, bool is_preload,
-                         PrivilegeLevel* level);
+  Status CheckSignatures(bool check_reference, PrivilegeLevel* level);
   Status CheckSignatureMismatch();
 
   STEP_NAME(Signature)

diff --git a/src/common/step/security/step_recover_signature.cc b/src/common/step/security/step_recover_signature.cc
index ce47815..deecdb5 100644 (file)
--- a/src/common/step/security/step_recover_signature.cc
+++ b/src/common/step/security/step_recover_signature.cc
@@ -16,7 +16,7 @@ Step::Status StepRecoverSignature::RecoveryUpdate() {
   PrivilegeLevel level;
   if (!ValidateSignatures(GetSignatureRoot(), &level,
                          &context_->certificate_info.get(), false,
-                         false, &error_message)) {
+                         &error_message)) {
     LOG(ERROR) << "Failed to verify signature: " << error_message;
     return Status::CERT_ERROR;
   }

diff --git a/src/unit_tests/signature_unittest.cc b/src/unit_tests/signature_unittest.cc
index 6594af2..c804db8 100644 (file)
--- a/src/unit_tests/signature_unittest.cc
+++ b/src/unit_tests/signature_unittest.cc
@@ -27,7 +27,7 @@ TEST_F(SignatureValidatorTest, HandlesInitializedSignatureDir) {
   common_installer::CertificateInfo cert_info;
   std::string error;
   EXPECT_TRUE(ValidateSignatures(*signature_file, &level, &cert_info, true,
-                                 false, &error));
+                                 &error));
 }
 
 // Tests signature verifier with signature directory containing bad signatures
@@ -38,7 +38,7 @@ TEST_F(SignatureValidatorTest, HandlesBadSignatureDir) {
   common_installer::CertificateInfo cert_info;
   std::string error;
   EXPECT_FALSE(ValidateSignatures(*signature_file, &level, &cert_info, true,
-                                  false, &error));
+                                  &error));
 }
 
 }  // namespace security