Change-Id: I287d9075c342a28c32f9b3df0cdcc4435a71cc7a
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>
#include "InstallerUtil.h"
#include "InstallerUtil.h"
-#define OSP_INSTALLER_VERSION "version=[20130826.3]"
+#define OSP_INSTALLER_VERSION "version=[20130827.1]"
#define DIR_BIN L"/bin"
#define DIR_INFO L"/info"
#define DIR_BIN L"/bin"
#define DIR_INFO L"/info"
,__isOspCompat(false)
,__isPreloaded(false)
,__isHybridService(false)
,__isOspCompat(false)
,__isPreloaded(false)
,__isHybridService(false)
-,__isVerificationMode(false)
+,__isVerificationMode(true)
,__isUpdated(false)
,__isAppSetting(false)
,__isCsc(false)
,__isUpdated(false)
,__isAppSetting(false)
,__isCsc(false)
{
InstallationContext* pContext = GetContext();
{
InstallationContext* pContext = GetContext();
- if ((File::IsFileExist(pContext->GetSignatureXmlPath()) == true) &&
- (File::IsFileExist(pContext->GetAuthorSignatureXmlPath()) == true) &&
- (pContext->__isHybridService == false))
+ if (pContext->__isHybridService == true)
- AppLog("[VerifySignature] VerificationMode ON");
- pContext->__isVerificationMode = true;
+ AppLog("[VerifySignature] VerificationMode OFF");
+ pContext->__isVerificationMode = false;
+ }
+ else
+ {
+ TryReturn(File::IsFileExist(pContext->GetAuthorSignatureXmlPath()) == true, INSTALLER_ERROR_PACKAGE_INVALID, "no author-signature.xml");
+ TryReturn(File::IsFileExist(pContext->GetSignatureXmlPath()) == true, INSTALLER_ERROR_PACKAGE_INVALID, "no signature1.xml");
}
String installPath = pContext->__installDir;
}
String installPath = pContext->__installDir;
TryReturn(!IsFailed(r), INSTALLER_ERROR_PACKAGE_INVALID, "UnzipTo(manifest.xml) failed.");
r = unzipper.UnzipTo(tempDir, L"signature1.xml");
TryReturn(!IsFailed(r), INSTALLER_ERROR_PACKAGE_INVALID, "UnzipTo(manifest.xml) failed.");
r = unzipper.UnzipTo(tempDir, L"signature1.xml");
- //TryReturn(!IsFailed(r), INSTALLER_ERROR_PACKAGE_INVALID, "UnzipTo(signature1.xml) failed.");
+ TryReturn(!IsFailed(r), INSTALLER_ERROR_PACKAGE_INVALID, "UnzipTo(signature1.xml) failed.");
r = unzipper.UnzipTo(tempDir, L"author-signature.xml");
r = unzipper.UnzipTo(tempDir, L"author-signature.xml");
- //TryReturn(!IsFailed(r), INSTALLER_ERROR_PACKAGE_INVALID, "UnzipTo(author-signature.xml) failed.");
+ TryReturn(!IsFailed(r), INSTALLER_ERROR_PACKAGE_INVALID, "UnzipTo(author-signature.xml) failed.");
AppLog("UnzipTo(manifest.xml) - END");
AppLog("UnzipTo(manifest.xml) - END");
- if ((File::IsFileExist(__pContext->GetSignatureXmlPath()) == true) &&
- (File::IsFileExist(__pContext->GetAuthorSignatureXmlPath()) == true))
- {
- AppLog("[VerifySignature] VerificationMode ON");
- __pContext->__isVerificationMode = true;
- }
-
GoNextState();
return error;
}
GoNextState();
return error;
}