From fc936e323b1d679e1da54e3dd91721d226fc77f6 Mon Sep 17 00:00:00 2001 From: Soyoung Kim Date: Wed, 5 Jun 2013 16:32:54 +0900 Subject: [PATCH] Fixed save certification for distributor2. [Issue#] N/A [Problem] N/A [Cause] N/A [Solution] Fixed save certification for distributor2. [SCMRequest] N/A Change-Id: Ic62dae0a4c41514056ee2251e6ed85909908d700 --- src/jobs/widget_install/task_certify.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/jobs/widget_install/task_certify.cpp b/src/jobs/widget_install/task_certify.cpp index edf9f1d..68189ac 100644 --- a/src/jobs/widget_install/task_certify.cpp +++ b/src/jobs/widget_install/task_certify.cpp @@ -265,7 +265,8 @@ void TaskCertify::stepSignature() "Certificate is REVOKED"); } - if (result == WrtSignatureValidator::SIGNATURE_INVALID) { + if (result == WrtSignatureValidator::SIGNATURE_INVALID && + iter->getFileNumber() <= 1) { LogWarning("Signature is INVALID"); // TODO change exception name ThrowMsg(Exceptions::SignatureInvalid, @@ -273,18 +274,13 @@ void TaskCertify::stepSignature() } if (data.isAuthorSignature()) { - if (result == WrtSignatureValidator::SIGNATURE_VERIFIED || - m_contextData.wacSecurity.isDistributorSigned()) - { + if (result == WrtSignatureValidator::SIGNATURE_VERIFIED ) { processAuthorSignature(data); - } else if (result == - WrtSignatureValidator::SIGNATURE_DISREGARD) - { - continue; } } else { - // now signature _must_ be verified - processDistributorSignature(data); + if (result != WrtSignatureValidator::SIGNATURE_INVALID) { + processDistributorSignature(data); + } } } Catch(ParserSchemaException::Base) { LogError("Error occured in ParserSchema."); -- 2.7.4