From 04f700c71f12a71ad75ff2cdf01e6cd5cea3c278 Mon Sep 17 00:00:00 2001
From: Duyoung Jang <duyoung.jang@samsung.com>
Date: Fri, 23 Nov 2012 19:43:21 +0900
Subject: [PATCH] Update SignatureStep and Save Certificate

Change-Id: Icb4e7a560f1791fab6bb2a71df63f73adc8e0485
---
 .cproject                            |   2 +
 inc/InstallerDefs.h                  |   2 +-
 src/Manager/ConfigurationManager.cpp |  18 +--
 src/Manager/SignatureManager.cpp     | 296 +++++++++++++++++++----------------
 src/Manager/SignatureManager.h       |   7 +-
 src/Step/SignatureStep.cpp           |  27 +---
 6 files changed, 181 insertions(+), 171 deletions(-)

diff --git a/.cproject b/.cproject
index c749de8..0e1e2f5 100755
--- a/.cproject
+++ b/.cproject
@@ -46,6 +46,7 @@
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/lib/glib-2.0/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/glib-2.0&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/drm-intel&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../../osp-appfw/src/base/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../../osp-appfw/src/app/inc&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;../../osp-appfw/src/system/inc&quot;"/>
@@ -137,6 +138,7 @@
 								</option>
 								<option id="gnu.cpp.link.option.libs.850444138" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="pkgmgr_parser"/>
+									<listOptionValue builtIn="false" value="drm-service-core-intel"/>
 									<listOptionValue builtIn="false" value="app2ext"/>
 									<listOptionValue builtIn="false" value="glib-2.0"/>
 									<listOptionValue builtIn="false" value="pkgmgr_installer"/>
diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index c3f9104..c67e634 100755
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -21,7 +21,7 @@
 #ifndef _INSTALLER_DEFS_H_
 #define _INSTALLER_DEFS_H_
 
-#define OSP_INSTALLER_VERSION "osp-installer version = [2012/11/20]_RC[1]"
+#define OSP_INSTALLER_VERSION "osp-installer version = [2012/11/26]_RC[1]"
 
 #define DIR_BIN				L"/bin"
 #define DIR_INFO			L"/info"
diff --git a/src/Manager/ConfigurationManager.cpp b/src/Manager/ConfigurationManager.cpp
index 0782600..5495121 100755
--- a/src/Manager/ConfigurationManager.cpp
+++ b/src/Manager/ConfigurationManager.cpp
@@ -30,7 +30,6 @@
 #include <FBaseUtilStringUtil.h>
 #include <FIoFile.h>
 #include <FIoDirectory.h>
-#include <FSecCryptoSha1Hash.h>
 #include <FSecCertX509CertificatePath.h>
 #include <FApp_Aul.h>
 #include <FApp_PackageInfoImpl.h>
@@ -45,7 +44,6 @@ using namespace Osp::Base;
 using namespace Osp::Base::Collection;
 using namespace Osp::Base::Utility;
 using namespace Osp::Security::Cert;
-using namespace Osp::Security::Crypto;
 using namespace Osp::App;
 using namespace Osp::Io;
 
@@ -388,14 +386,14 @@ ConfigurationManager::RegisterCertInfo(InstallationContext* pContext) const
 
 	if (pAuthorCertPath)
 	{
-		AppLogTag(OSP_INSTALLER, "pAuthorCertPath is processing.");
+		AppLogTag(OSP_INSTALLER, "[AuthorCert]");
 		result = SetCertHashValue(handle, pAuthorCertPath, PM_SET_AUTHOR_SIGNER_CERT);
 		TryCatch(result == true, , "[osp-installer] RegisterCertHashValue() failed. [pAuthorCertPath]");
 	}
 
 	if (pDistributorCertPath)
 	{
-		AppLogTag(OSP_INSTALLER, "pDistributorCertPath is processing.");
+		AppLogTag(OSP_INSTALLER, "[DistributorCert]");
 		result = SetCertHashValue(handle, pDistributorCertPath, PM_SET_DISTRIBUTOR_SIGNER_CERT);
 		TryCatch(result == true, , "[osp-installer] RegisterCertHashValue() failed. [pDistributorCertPath]");
 	}
@@ -434,7 +432,9 @@ ConfigurationManager::SetCertHashValue(void* pHandle, X509CertificatePath* pCert
 		pCertValue = GetCertValueN(pCert);
 		TryCatch(pCertValue, result = false, "[osp-installer] pCertValue is null.[%i]", i);
 
-		AppLogTag(OSP_INSTALLER, "[%d] - pCertValue[%s] certType[%d]", i, pCertValue, certType);
+		AppLogTag(OSP_INSTALLER, "------------------------------------------");
+		AppLogTag(OSP_INSTALLER, "CertValue(%d), certType[%d]", i, certType);
+		AppLogTag(OSP_INSTALLER, "[%s]", pCertValue);
 
 		res = pkgmgr_installer_set_cert_value(pHandle, (pkgmgr_instcert_type)certType, pCertValue);
 		TryCatch(res == 0, result = false, "[osp-installer] pkgmgr_installer_set_cert_value(%d) failed.[%d]", i, res);
@@ -458,25 +458,19 @@ char*
 ConfigurationManager::GetCertValueN(ICertificate* pCert) const
 {
 	bool result = true;
-	Sha1Hash hash;
 	ByteBuffer* pEncodedData = null;
-	ByteBuffer* pHashValue = null;
 	String base64Value;
 	char* pEncodedValue = null;
 
 	pEncodedData = pCert->GetEncodedDataN();
 	TryCatch(pEncodedData, result = false, "[osp-installer] pEncodedData is null.");
 
-	pHashValue = hash.GetHashN(*pEncodedData);
-	TryCatch(pHashValue, result = false, "[osp-installer] pHashValue is null");
-
-	StringUtil::EncodeToBase64String(*pHashValue, base64Value);
+	StringUtil::EncodeToBase64String(*pEncodedData, base64Value);
 	pEncodedValue = _StringConverter::CopyToCharArrayN(base64Value);
 	TryCatch(pEncodedValue, result = false, "[osp-installer] pEncodedValue is null");
 
 CATCH:
 	delete pEncodedData;
-	delete pHashValue;
 
 	return pEncodedValue;
 }
diff --git a/src/Manager/SignatureManager.cpp b/src/Manager/SignatureManager.cpp
index 9a90bb9..4545971 100755
--- a/src/Manager/SignatureManager.cpp
+++ b/src/Manager/SignatureManager.cpp
@@ -87,47 +87,41 @@ CATCH:
 }
 
 bool
-SignatureManager::AddCert(RootCertificateType certType)
+SignatureManager::AddCert()
 {
+	TryReturn(__pAuthorSignature, false, "[osp-installer] __pAuthorSignature is null.");
 	TryReturn(__pDistributorSignature, false, "[osp-installer] __pDistributorSignature is null.");
 
 	bool ret = true;
+	IList* pAuthorCertChain = __pAuthorSignature->GetAuthorCertChain();
+	IList* pDistributorCertChain = __pDistributorSignature->GetDistributorCertChain();
 
-	if (certType == ROOT_CERTIFICATE_DEVELOPER)
+	if (pAuthorCertChain)
 	{
-		IList* pAuthorCertChain = __pAuthorSignature->GetAuthorCertChain();
+		AppLogTag(OSP_INSTALLER, "AddCertificate - AuthorCertChain");
 
-		if (pAuthorCertChain)
-		{
-			AppLogTag(OSP_INSTALLER, "AddCertificate - AuthorCertChain");
-
-			__pAuthorCertPath = new X509CertificatePath();
-			TryCatch(__pAuthorCertPath, ret = false, "[osp-installer] __pAuthorCertPath is null.");
+		__pAuthorCertPath = new X509CertificatePath();
+		TryCatch(__pAuthorCertPath, ret = false, "[osp-installer] __pAuthorCertPath is null.");
 
-			ret = AddCertificate(__pAuthorCertPath, pAuthorCertChain);
-			TryCatch(ret == true, ret = false, "[osp-installer] AddCertificate(AuthorCert) is failed.");
+		ret = AddCertificate(__pAuthorCertPath, pAuthorCertChain);
+		TryCatch(ret == true, ret = false, "[osp-installer] AddCertificate(AuthorCert) is failed.");
 
-			ret = AddRootCertificate(__pAuthorCertPath, certType);
-			TryCatch(ret == true, ret = false, "[osp-installer] AddRootCertificate(AuthorCertPath) is failed.");
-		}
+		ret = AddAuthorRootCert(__pAuthorCertPath);
+		TryCatch(ret == true, ret = false, "[osp-installer] AddAuthorRootCert(AuthorCertPath) is failed.");
 	}
-	else
-	{
-		IList* pDistributorCertChain = __pDistributorSignature->GetDistributorCertChain();
 
-		if (pDistributorCertChain)
-		{
-			AppLogTag(OSP_INSTALLER, "AddCertificate - DistributorCert [%d]", certType);
+	if (pDistributorCertChain)
+	{
+		AppLogTag(OSP_INSTALLER, "AddCertificate - DistributorCert");
 
-			__pDistributorCertPath = new X509CertificatePath();
-			TryCatch(__pDistributorCertPath, ret = false, "[osp-installer] __pDistributorCertPath is null.");
+		__pDistributorCertPath = new X509CertificatePath();
+		TryCatch(__pDistributorCertPath, ret = false, "[osp-installer] __pDistributorCertPath is null.");
 
-			ret = AddCertificate(__pDistributorCertPath, pDistributorCertChain);
-			TryCatch(ret == true, ret = false, "[osp-installer] AddCertificate(DistributorCert) is failed.");
+		ret = AddCertificate(__pDistributorCertPath, pDistributorCertChain);
+		TryCatch(ret == true, ret = false, "[osp-installer] AddCertificate(DistributorCert) is failed.");
 
-			ret = AddRootCertificate(__pDistributorCertPath, certType);
-			TryCatch(ret == true, ret = false, "[osp-installer] AddRootCertificate(DistributorCert) is failed.");
-		}
+		ret = AddDistributorRootCert(__pDistributorCertPath);
+		TryCatch(ret == true, ret = false, "[osp-installer] AddDistributorRootCert(DistributorCert) is failed.");
 	}
 
 CATCH:
@@ -135,36 +129,28 @@ CATCH:
 }
 
 bool
-SignatureManager::VerifyChain(RootCertificateType certType)
+SignatureManager::VerifyChain()
 {
+	TryReturn(__pAuthorCertPath, false, "[osp-installer] __pAuthorCertPath is null.");
+	TryReturn(__pDistributorCertPath, false, "[osp-installer] __pDistributorCertPath is null.");
+
 	bool ret = true;
 
-	if (certType == ROOT_CERTIFICATE_DEVELOPER)
-	{
-		if (__pAuthorCertPath)
-		{
-			AppLogTag(OSP_INSTALLER, "__pAuthorCertPath Validate [START]");
-			ret = Validate(__pAuthorCertPath);
-			AppLogTag(OSP_INSTALLER, "__pAuthorCertPath Validate [END]");
-			TryCatch(ret == true, ret = false, "[osp-installer] Validate(AuthorCert) is failed.");
+	AppLogTag(OSP_INSTALLER, "AuthorCert Validate - START");
+	ret = Validate(__pAuthorCertPath);
+	AppLogTag(OSP_INSTALLER, "AuthorCert Validate - END");
+	TryCatch(ret == true, ret = false, "[osp-installer] Validate(AuthorCert) is failed.");
 
-			__pContext->SetAuthorCertPath(__pAuthorCertPath);
-			__pAuthorCertPath = null;
-		}
-	}
-	else
-	{
-		if (__pDistributorCertPath)
-		{
-			AppLogTag(OSP_INSTALLER, "__pDistributorCertPath Validate [START][%d]", certType);
-			ret = Validate(__pDistributorCertPath);
-			AppLogTag(OSP_INSTALLER, "__pDistributorCertPath Validate [END]");
-			TryCatch(ret == true, ret = false, "[osp-installer] Validate(DistributorCert) is failed.");
+	__pContext->SetAuthorCertPath(__pAuthorCertPath);
+	__pAuthorCertPath = null;
 
-			__pContext->SetDistributorCertPath(__pDistributorCertPath);
-			__pDistributorCertPath = null;
-		}
-	}
+	AppLogTag(OSP_INSTALLER, "DistributorCert Validate - START");
+	ret = Validate(__pDistributorCertPath);
+	AppLogTag(OSP_INSTALLER, "DistributorCert Validate - END");
+	TryCatch(ret == true, ret = false, "[osp-installer] Validate(DistributorCert) is failed.");
+
+	__pContext->SetDistributorCertPath(__pDistributorCertPath);
+	__pDistributorCertPath = null;
 
 CATCH:
 	delete __pAuthorCertPath;
@@ -187,7 +173,6 @@ SignatureManager::Validate(X509CertificatePath* pCertPath)
 
 	if (valResult != VALIDATION_SUCCESS)
 	{
-
 		AppLogTag(OSP_INSTALLER, "Validate() fail! - ValidationResult = [%d]", valResult);
 		AppLogTag(OSP_INSTALLER, "------------------------------------------");
 		return false;
@@ -203,17 +188,6 @@ SignatureManager::Validate(X509CertificatePath* pCertPath)
 
 		AppLogTag(OSP_INSTALLER, "Validate() success!");
 		AppLogTag(OSP_INSTALLER, "------------------------------------------");
-
-		ICertificate *pTrustCa = null;
-		pTrustCa = pCertPath->GetTrustAnchorN();
-		if (pTrustCa)
-		{
-			String subjectName;
-			subjectName = pTrustCa->GetSubject();
-			AppLogTag(OSP_INSTALLER, "TrustAnchor subjectName = [%ls]", subjectName.GetPointer());
-		}
-
-		delete pTrustCa;
 	}
 
 	return true;
@@ -225,6 +199,7 @@ SignatureManager::AddCertificate(X509CertificatePath* pCertPath, IList* pCertCha
 	TryReturn(pCertChain, false, "[osp-installer] pCertChain is null.");
 
 	bool ret = true;
+	result r = E_SUCCESS;
 	X509Certificate* pCertificate = null;
 
 	for (int i = 0; i < pCertChain->GetCount(); i++)
@@ -235,8 +210,6 @@ SignatureManager::AddCertificate(X509CertificatePath* pCertPath, IList* pCertCha
 		{
 			AppLogTag(OSP_INSTALLER, "[cert][%d]", i);
 
-			result r = E_SUCCESS;
-
 			pCertificate = new X509Certificate;
 			TryCatch(pCertificate, ret = false, "[osp-installer] pCertificate is null.");
 
@@ -257,80 +230,141 @@ CATCH:
 }
 
 bool
-SignatureManager::AddRootCertificate(X509CertificatePath* pCertPath, RootCertificateType certType)
+SignatureManager::AddDistributorRootCert(X509CertificatePath* pCertPath)
 {
 	TryReturn(pCertPath, false, "[osp-installer] pCertPath is null.");
 
-	bool ret = true;
 	result r = E_SUCCESS;
-	ByteBuffer byteBuffer;
-	X509Certificate rootCert;
-	int length = 0;
-	const char* pRootCert = null;
+	bool ret = true;
+	ICertificate* pIntermediateCA = null;
+	String issuer;
 
-	if (certType == ROOT_CERTIFICATE_PUBLIC)
-	{
-		pRootCert = "MIICozCCAgwCCQD9XW6kNg4bbjANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC"
-					"S1IxDjAMBgNVBAgMBVN1d29uMQ4wDAYDVQQHDAVTdXdvbjEWMBQGA1UECgwNVGl6"
-					"ZW4gVGVzdCBDQTEjMCEGA1UECwwaVFRpemVuIERpc3RyaWJ1dG9yIFRlc3QgQ0Ex"
-					"KTAnBgNVBAMMIFRpemVuIFB1YmxpYyBEaXN0cmlidXRvciBSb290IENBMB4XDTEy"
-					"MTAyNjA4MDAyN1oXDTIyMTAyNDA4MDAyN1owgZUxCzAJBgNVBAYTAktSMQ4wDAYD"
-					"VQQIDAVTdXdvbjEOMAwGA1UEBwwFU3V3b24xFjAUBgNVBAoMDVRpemVuIFRlc3Qg"
-					"Q0ExIzAhBgNVBAsMGlRUaXplbiBEaXN0cmlidXRvciBUZXN0IENBMSkwJwYDVQQD"
-					"DCBUaXplbiBQdWJsaWMgRGlzdHJpYnV0b3IgUm9vdCBDQTCBnzANBgkqhkiG9w0B"
-					"AQEFAAOBjQAwgYkCgYEA8o0kPY1U9El1BbBUF1k4jCq6mH8a6MmDJdjgsz+hILAY"
-					"sPWimRTXUcW8GAUWhZWgm1Fbb49xWcasA8b4bIJabC/6hLb8uWiozzpRXyQJbe7k"
-					"//RocskRqDmFOky8ANFsCCww72/Xbq8BFK1sxlGdmOWQiGwDWBDlS2Lw1XOMqb0C"
-					"AwEAATANBgkqhkiG9w0BAQUFAAOBgQBUotZqTNFr+SNyqeZqhOToRsg3ojN1VJUa"
-					"07qdlVo5I1UObSE+UTJPJ0NtSj7OyTY7fF3E4xzUv/w8aUoabQP1erEmztY/AVD+"
-					"phHaPytkZ/Dx+zDZ1u5e9bKm5zfY4dQs/A53zDQta5a/NkZOEF97Dj3+bzAh2bP7"
-					"KOszlocFYw==";
-	}
-	else if (certType == ROOT_CERTIFICATE_PARTNER)
-	{
-		pRootCert = "MIICozCCAgwCCQD9IBoOxzq2hjANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC"
-					"S1IxDjAMBgNVBAgMBVN1d29uMQ4wDAYDVQQHDAVTdXdvbjEWMBQGA1UECgwNVGl6"
-					"ZW4gVGVzdCBDQTEiMCAGA1UECwwZVGl6ZW4gRGlzdHJpYnV0b3IgVGVzdCBDQTEq"
-					"MCgGA1UEAwwhVGl6ZW4gUGFydG5lciBEaXN0cmlidXRvciBSb290IENBMB4XDTEy"
-					"MTAyNjA4MTIzMVoXDTIyMTAyNDA4MTIzMVowgZUxCzAJBgNVBAYTAktSMQ4wDAYD"
-					"VQQIDAVTdXdvbjEOMAwGA1UEBwwFU3V3b24xFjAUBgNVBAoMDVRpemVuIFRlc3Qg"
-					"Q0ExIjAgBgNVBAsMGVRpemVuIERpc3RyaWJ1dG9yIFRlc3QgQ0ExKjAoBgNVBAMM"
-					"IVRpemVuIFBhcnRuZXIgRGlzdHJpYnV0b3IgUm9vdCBDQTCBnzANBgkqhkiG9w0B"
-					"AQEFAAOBjQAwgYkCgYEAnIBA2qQEaMzGalP0kzvwUxdCC6ybSC/fb+M9iGvt8QXp"
-					"ic2yARQB+bIhfbEu1XHwE1jCAGxKd6uT91b4FWr04YwnBPoRX4rBGIYlqo/dg+pS"
-					"rGyFjy7vfr0BOdWp2+WPlTe7SOS6bVauncrSoHxX0spiLaU5LU686BKr7YaABV0C"
-					"AwEAATANBgkqhkiG9w0BAQUFAAOBgQAX0Tcfmxcs1TUPBdr1U1dx/W/6Y4PcAF7n"
-					"DnMrR0ZNRPgeSCiVLax1bkHxcvW74WchdKIb24ZtAsFwyrsmUCRV842YHdfddjo6"
-					"xgUu7B8n7hQeV3EADh6ft/lE8nalzAl9tALTxAmLtYvEYA7thvDoKi1k7bN48izL"
-					"gS9G4WEAUg==";
-	}
-	else if (certType == ROOT_CERTIFICATE_DEVELOPER)
-	{
-		pRootCert = "MIICnzCCAggCCQCn+GGT4zh+BjANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC"
-					"S1IxDjAMBgNVBAgMBVN1d29uMQ4wDAYDVQQHDAVTdXdvbjEWMBQGA1UECgwNVGl6"
-					"ZW4gVGVzdCBDQTElMCMGA1UECwwcVGl6ZW4gVGVzdCBEZXZlbG9wZXIgUm9vdCBD"
-					"QTElMCMGA1UEAwwcVGl6ZW4gVGVzdCBEZXZlbG9wZXIgUm9vdCBDQTAeFw0xMjEw"
-					"MjYwOTUwMTNaFw0yMjEwMjQwOTUwMTNaMIGTMQswCQYDVQQGEwJLUjEOMAwGA1UE"
-					"CAwFU3V3b24xDjAMBgNVBAcMBVN1d29uMRYwFAYDVQQKDA1UaXplbiBUZXN0IENB"
-					"MSUwIwYDVQQLDBxUaXplbiBUZXN0IERldmVsb3BlciBSb290IENBMSUwIwYDVQQD"
-					"DBxUaXplbiBUZXN0IERldmVsb3BlciBSb290IENBMIGfMA0GCSqGSIb3DQEBAQUA"
-					"A4GNADCBiQKBgQDWT6ZH5JyGadTUK1QmNwU8j+py4WtuElJE+4/wPFP8/KBmvvmI"
-					"rGVjhUbKXToKIo8N6C/0SLxGEWuRAIoZHhg5JVbw1Ay7smgJJHizDUAqMTmV6LI9"
-					"yTFbBV+OlO2Dir4LVdQ/XDBiqqslr7pqXgsg1V2g7x+tOI/f3dn2kWoVZQIDAQAB"
-					"MA0GCSqGSIb3DQEBBQUAA4GBADGJYMtzUBDK+KKLZQ6zYmrKb+OWLlmEr/t/c2af"
-					"KjTKUtommcz8VeTPqrDBOwxlVPdxlbhisCYzzvwnWeZk1aeptxxU3kdW9N3/wocN"
-					"5nBzgqkkHJnj/ptqjrH2v/m0Z3hBuI4/akHIIfCBF8mUHwqcxYsRdcCIrkgp2Aiv"
-					"bSaM";
-	}
-	else
+	pIntermediateCA = pCertPath->GetCertificateN(1);
+	TryCatch(pIntermediateCA, ret = false, "[osp-installer] pIntermediateCA is null.");
+
+	issuer = pIntermediateCA->GetIssuer();
+
+	for(int certType = ROOT_CERTIFICATE_PUBLIC; certType <= ROOT_CERTIFICATE_PRIVATE; certType++)
 	{
-		pRootCert = "NeedToAddCert";
+		const char* pRootCert = null;
+		ByteBuffer byteBuffer;
+		X509Certificate rootCert;
+		int length = 0;
+
+		if (certType == ROOT_CERTIFICATE_PUBLIC)
+		{
+			pRootCert = "MIICozCCAgwCCQD9XW6kNg4bbjANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC"
+						"S1IxDjAMBgNVBAgMBVN1d29uMQ4wDAYDVQQHDAVTdXdvbjEWMBQGA1UECgwNVGl6"
+						"ZW4gVGVzdCBDQTEjMCEGA1UECwwaVFRpemVuIERpc3RyaWJ1dG9yIFRlc3QgQ0Ex"
+						"KTAnBgNVBAMMIFRpemVuIFB1YmxpYyBEaXN0cmlidXRvciBSb290IENBMB4XDTEy"
+						"MTAyNjA4MDAyN1oXDTIyMTAyNDA4MDAyN1owgZUxCzAJBgNVBAYTAktSMQ4wDAYD"
+						"VQQIDAVTdXdvbjEOMAwGA1UEBwwFU3V3b24xFjAUBgNVBAoMDVRpemVuIFRlc3Qg"
+						"Q0ExIzAhBgNVBAsMGlRUaXplbiBEaXN0cmlidXRvciBUZXN0IENBMSkwJwYDVQQD"
+						"DCBUaXplbiBQdWJsaWMgRGlzdHJpYnV0b3IgUm9vdCBDQTCBnzANBgkqhkiG9w0B"
+						"AQEFAAOBjQAwgYkCgYEA8o0kPY1U9El1BbBUF1k4jCq6mH8a6MmDJdjgsz+hILAY"
+						"sPWimRTXUcW8GAUWhZWgm1Fbb49xWcasA8b4bIJabC/6hLb8uWiozzpRXyQJbe7k"
+						"//RocskRqDmFOky8ANFsCCww72/Xbq8BFK1sxlGdmOWQiGwDWBDlS2Lw1XOMqb0C"
+						"AwEAATANBgkqhkiG9w0BAQUFAAOBgQBUotZqTNFr+SNyqeZqhOToRsg3ojN1VJUa"
+						"07qdlVo5I1UObSE+UTJPJ0NtSj7OyTY7fF3E4xzUv/w8aUoabQP1erEmztY/AVD+"
+						"phHaPytkZ/Dx+zDZ1u5e9bKm5zfY4dQs/A53zDQta5a/NkZOEF97Dj3+bzAh2bP7"
+						"KOszlocFYw==";
+		}
+		else if (certType == ROOT_CERTIFICATE_PARTNER)
+		{
+			pRootCert = "MIICozCCAgwCCQD9IBoOxzq2hjANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMC"
+						"S1IxDjAMBgNVBAgMBVN1d29uMQ4wDAYDVQQHDAVTdXdvbjEWMBQGA1UECgwNVGl6"
+						"ZW4gVGVzdCBDQTEiMCAGA1UECwwZVGl6ZW4gRGlzdHJpYnV0b3IgVGVzdCBDQTEq"
+						"MCgGA1UEAwwhVGl6ZW4gUGFydG5lciBEaXN0cmlidXRvciBSb290IENBMB4XDTEy"
+						"MTAyNjA4MTIzMVoXDTIyMTAyNDA4MTIzMVowgZUxCzAJBgNVBAYTAktSMQ4wDAYD"
+						"VQQIDAVTdXdvbjEOMAwGA1UEBwwFU3V3b24xFjAUBgNVBAoMDVRpemVuIFRlc3Qg"
+						"Q0ExIjAgBgNVBAsMGVRpemVuIERpc3RyaWJ1dG9yIFRlc3QgQ0ExKjAoBgNVBAMM"
+						"IVRpemVuIFBhcnRuZXIgRGlzdHJpYnV0b3IgUm9vdCBDQTCBnzANBgkqhkiG9w0B"
+						"AQEFAAOBjQAwgYkCgYEAnIBA2qQEaMzGalP0kzvwUxdCC6ybSC/fb+M9iGvt8QXp"
+						"ic2yARQB+bIhfbEu1XHwE1jCAGxKd6uT91b4FWr04YwnBPoRX4rBGIYlqo/dg+pS"
+						"rGyFjy7vfr0BOdWp2+WPlTe7SOS6bVauncrSoHxX0spiLaU5LU686BKr7YaABV0C"
+						"AwEAATANBgkqhkiG9w0BAQUFAAOBgQAX0Tcfmxcs1TUPBdr1U1dx/W/6Y4PcAF7n"
+						"DnMrR0ZNRPgeSCiVLax1bkHxcvW74WchdKIb24ZtAsFwyrsmUCRV842YHdfddjo6"
+						"xgUu7B8n7hQeV3EADh6ft/lE8nalzAl9tALTxAmLtYvEYA7thvDoKi1k7bN48izL"
+						"gS9G4WEAUg==";
+		}
+		else
+		{
+			pRootCert = "NeedToAddCert";
+		}
+
+		length = strlen(pRootCert);
+		byteBuffer.Construct(length);
+
+		r = byteBuffer.SetArray((byte*)pRootCert, 0, length);
+		TryCatch(!IsFailed(r), ret = false, "[osp-installer] SetArray() is failed.");
+
+		byteBuffer.Flip();
+
+		r = rootCert.Construct(byteBuffer);
+		TryCatch(!IsFailed(r), ret = false, "[osp-installer] rootCert.Construct() is failed.");
+
+		String subject = rootCert.GetSubject();
+		AppLogTag(OSP_INSTALLER, "------------------------------------------");
+		AppLogTag(OSP_INSTALLER, "Issuer  = [%ls]", issuer.GetPointer());
+		AppLogTag(OSP_INSTALLER, "Subject = [%ls]", subject.GetPointer());
+		AppLogTag(OSP_INSTALLER, "------------------------------------------");
+
+		if (subject == issuer)
+		{
+			AppLogTag(OSP_INSTALLER, "subject, issuer is matched.");
+
+			r = pCertPath->AddCertificate(rootCert);
+			TryCatch(!IsFailed(r), ret = false, "[osp-installer] AddCertificate(DistributorRootCert) is failed.");
+
+			AppLogTag(OSP_INSTALLER, "AddCertificate() RootCert = [%d]", certType);
+			__pContext->SetRootCertType((RootCertificateType)certType);
+
+			ret = true;
+
+			break;
+		}
+		else
+		{
+			AppLogTag(OSP_INSTALLER, "subject, issuer is not matched.");
+			ret = false;
+		}
 	}
 
-	length = strlen(pRootCert);
+CATCH:
+	delete pIntermediateCA;
+	return ret;
+}
+
+bool
+SignatureManager::AddAuthorRootCert(X509CertificatePath* pCertPath)
+{
+	TryReturn(pCertPath, false, "[osp-installer] pCertPath is null.");
+
+	result r = E_SUCCESS;
+	bool ret = true;
+	ByteBuffer byteBuffer;
+	X509Certificate rootCert;
+	int length = 0;
+	const char* pAuthorRootCert = "MIICnzCCAggCCQCn+GGT4zh+BjANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UEBhMC"
+																"S1IxDjAMBgNVBAgMBVN1d29uMQ4wDAYDVQQHDAVTdXdvbjEWMBQGA1UECgwNVGl6"
+																"ZW4gVGVzdCBDQTElMCMGA1UECwwcVGl6ZW4gVGVzdCBEZXZlbG9wZXIgUm9vdCBD"
+																"QTElMCMGA1UEAwwcVGl6ZW4gVGVzdCBEZXZlbG9wZXIgUm9vdCBDQTAeFw0xMjEw"
+																"MjYwOTUwMTNaFw0yMjEwMjQwOTUwMTNaMIGTMQswCQYDVQQGEwJLUjEOMAwGA1UE"
+																"CAwFU3V3b24xDjAMBgNVBAcMBVN1d29uMRYwFAYDVQQKDA1UaXplbiBUZXN0IENB"
+																"MSUwIwYDVQQLDBxUaXplbiBUZXN0IERldmVsb3BlciBSb290IENBMSUwIwYDVQQD"
+																"DBxUaXplbiBUZXN0IERldmVsb3BlciBSb290IENBMIGfMA0GCSqGSIb3DQEBAQUA"
+																"A4GNADCBiQKBgQDWT6ZH5JyGadTUK1QmNwU8j+py4WtuElJE+4/wPFP8/KBmvvmI"
+																"rGVjhUbKXToKIo8N6C/0SLxGEWuRAIoZHhg5JVbw1Ay7smgJJHizDUAqMTmV6LI9"
+																"yTFbBV+OlO2Dir4LVdQ/XDBiqqslr7pqXgsg1V2g7x+tOI/f3dn2kWoVZQIDAQAB"
+																"MA0GCSqGSIb3DQEBBQUAA4GBADGJYMtzUBDK+KKLZQ6zYmrKb+OWLlmEr/t/c2af"
+																"KjTKUtommcz8VeTPqrDBOwxlVPdxlbhisCYzzvwnWeZk1aeptxxU3kdW9N3/wocN"
+																"5nBzgqkkHJnj/ptqjrH2v/m0Z3hBuI4/akHIIfCBF8mUHwqcxYsRdcCIrkgp2Aiv"
+																"bSaM";
+
+	length = strlen(pAuthorRootCert);
 	byteBuffer.Construct(length);
 
-	r = byteBuffer.SetArray((byte*)pRootCert, 0, length);
+	r = byteBuffer.SetArray((byte*)pAuthorRootCert, 0, length);
 	TryCatch(!IsFailed(r), ret = false, "[osp-installer] SetArray() is failed.");
 
 	byteBuffer.Flip();
@@ -339,7 +373,7 @@ SignatureManager::AddRootCertificate(X509CertificatePath* pCertPath, RootCertifi
 	TryCatch(!IsFailed(r), ret = false, "[osp-installer] rootCert.Construct() is failed.");
 
 	r = pCertPath->AddCertificate(rootCert);
-	TryCatch(!IsFailed(r), ret = false, "[osp-installer] AddCertificate(rootCert) is failed.");
+	TryCatch(!IsFailed(r), ret = false, "[osp-installer] AddCertificate(AuthorRootCert) is failed.");
 
 CATCH:
 	return ret;
diff --git a/src/Manager/SignatureManager.h b/src/Manager/SignatureManager.h
index 5c9e14b..4321040 100755
--- a/src/Manager/SignatureManager.h
+++ b/src/Manager/SignatureManager.h
@@ -45,8 +45,8 @@ public:
 
 	bool Construct(InstallationContext *pConext);
 	bool SetSignature();
-	bool AddCert(RootCertificateType certType);
-	bool VerifyChain(RootCertificateType certType);
+	bool AddCert();
+	bool VerifyChain();
 	//bool VerifySignature();
 
 private:
@@ -55,7 +55,8 @@ private:
 
 	bool Validate(Osp::Security::Cert::X509CertificatePath* pCertPath);
 	bool AddCertificate(Osp::Security::Cert::X509CertificatePath* pCertPath, Osp::Base::Collection::IList* pCertChain);
-	bool AddRootCertificate(Osp::Security::Cert::X509CertificatePath* pCertPath, RootCertificateType certType);
+	bool AddDistributorRootCert(Osp::Security::Cert::X509CertificatePath* pCertPath);
+	bool AddAuthorRootCert(Osp::Security::Cert::X509CertificatePath* pCertPath);
 
 private:
 	InstallationContext* __pContext;
diff --git a/src/Step/SignatureStep.cpp b/src/Step/SignatureStep.cpp
index 536f88d..cbe1df6 100755
--- a/src/Step/SignatureStep.cpp
+++ b/src/Step/SignatureStep.cpp
@@ -139,33 +139,12 @@ SignatureStep::OnStateCertChain(void)
 {
 	InstallerError error = INSTALLER_ERROR_NONE;
 	bool ret = true;
-	int rootCert = ROOT_CERTIFICATE_PUBLIC;
 
-	ret = __pSignatureManager->AddCert(ROOT_CERTIFICATE_DEVELOPER);
+	ret = __pSignatureManager->AddCert();
 	TryCatch(ret == true, error = INSTALLER_ERROR_INVALID_SIGNATURE, "[osp-installer] AddCert(DEVELOPER_ROOT_CERTIFICATE) failed");
 
-	ret = __pSignatureManager->VerifyChain(ROOT_CERTIFICATE_DEVELOPER);
-	TryCatch(ret == true, error = INSTALLER_ERROR_INVALID_SIGNATURE, "[osp-installer] VerifyChain(DEVELOPER_ROOT_CERTIFICATE) failed");
-
-	for(rootCert = ROOT_CERTIFICATE_PUBLIC; rootCert <= ROOT_CERTIFICATE_PRIVATE; rootCert++)
-	{
-		ret = __pSignatureManager->AddCert((RootCertificateType)rootCert);
-		TryCatch(ret == true, error = INSTALLER_ERROR_INVALID_SIGNATURE, "[osp-installer] AddCert() failed");
-
-		ret = __pSignatureManager->VerifyChain((RootCertificateType)rootCert);
-		if (ret == true)
-		{
-			AppLogTag(OSP_INSTALLER, "VerifyChain() success(Cert = [%d])", rootCert);
-			__pContext->SetRootCertType((RootCertificateType)rootCert);
-			error = INSTALLER_ERROR_NONE;
-			break;
-		}
-		else
-		{
-			AppLogTag(OSP_INSTALLER, "VerifyChain() fail(Cert = [%d])", rootCert);
-			error = INSTALLER_ERROR_INVALID_SIGNATURE;
-		}
-	}
+	ret = __pSignatureManager->VerifyChain();
+	TryCatch(ret == true, error = INSTALLER_ERROR_INVALID_SIGNATURE, "[osp-installer] VerifyChain() failed");
 
 CATCH:
 	GoNextState();
-- 
2.7.4