From: Duyoung Jang Date: Mon, 7 Jan 2013 00:37:07 +0000 (+0900) Subject: Remove unused API X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b41a01255153f8d1d4e66e6428fd198d22990fb0;p=framework%2Fosp%2Finstaller.git Remove unused API Change-Id: Ifd233813630d129d4704ff4dcf1c8cb408e66f7b Signed-off-by: Duyoung Jang --- diff --git a/.cproject b/.cproject index 0e1e2f5..c3d1435 100755 --- a/.cproject +++ b/.cproject @@ -40,6 +40,7 @@ + diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h index e57592b..76591b4 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=20130105.1" +#define OSP_INSTALLER_VERSION "osp-installer version=20130107.1" #define DIR_BIN L"/bin" #define DIR_INFO L"/info" @@ -204,7 +204,6 @@ enum RootCertificateType ROOT_CERTIFICATE_PARTNER, ROOT_CERTIFICATE_PARTNER_OPERATOR, ROOT_CERTIFICATE_PARTNER_MANUFACTURER, - ROOT_CERTIFICATE_PRIVATE, }; diff --git a/src/Manager/InstallerManager.cpp b/src/Manager/InstallerManager.cpp index 368a505..b8b5e8c 100755 --- a/src/Manager/InstallerManager.cpp +++ b/src/Manager/InstallerManager.cpp @@ -741,14 +741,9 @@ InstallerManager::PrintPackageInfo(const char* appId) AppLogTag(OSP_INSTALLER, "# api version = [%S]", pPackageInfoImpl->GetAppApiVersion().GetPointer()); AppLogTag(OSP_INSTALLER, "# uri = [%S]", pPackageInfoImpl->GetAppUrl().GetPointer()); AppLogTag(OSP_INSTALLER, "# cid = [%S]", pPackageInfoImpl->GetAppCid().GetPointer()); - AppLogTag(OSP_INSTALLER, "# parentId = [%S]", pPackageInfoImpl->GetAppParentId().GetPointer()); AppLogTag(OSP_INSTALLER, "# installationDate = [%S]", pPackageInfoImpl->GetAppInstallationTime().ToString().GetPointer()); AppLogTag(OSP_INSTALLER, "# rootpath = [%S]", pPackageInfoImpl->GetAppRootPath().GetPointer()); - AppLogTag(OSP_INSTALLER, "# readOnlySize = [%d]", pPackageInfoImpl->GetAppReadOnlySize()); - AppLogTag(OSP_INSTALLER, "# dataSize = [%d]", pPackageInfoImpl->GetAppDataSize()); AppLogTag(OSP_INSTALLER, "# storageType = [%d]", pPackageInfoImpl->GetAppStorageType()); - AppLogTag(OSP_INSTALLER, "# state = [%d]", pPackageInfoImpl->GetAppState()); - AppLogTag(OSP_INSTALLER, "# initiator = [%d]", pPackageInfoImpl->GetAppInitiatior()); AppLogTag(OSP_INSTALLER, "------------------------------------------"); pAppList = pPackageInfoImpl->GetAppInfoListN(); @@ -772,9 +767,7 @@ InstallerManager::PrintPackageInfo(const char* appId) AppLogTag(OSP_INSTALLER, "# packagename = [%S]", pAppInfoImpl->GetPackageName().GetPointer()); AppLogTag(OSP_INSTALLER, "# mainmenu icon = [%S]", pAppInfoImpl->GetMainmenuIcon().GetPointer()); AppLogTag(OSP_INSTALLER, "# setting icon = [%S]", pAppInfoImpl->GetSettingIcon().GetPointer()); - AppLogTag(OSP_INSTALLER, "# ticker icon = [%S]", pAppInfoImpl->GetTickerIcon().GetPointer()); AppLogTag(OSP_INSTALLER, "# quickpanel icon = [%S]", pAppInfoImpl->GetQuickpanelIcon().GetPointer()); - AppLogTag(OSP_INSTALLER, "# launchImage icon = [%S]", pAppInfoImpl->GetLaunchImageIcon().GetPointer()); AppLogTag(OSP_INSTALLER, "------------------------------------------"); } diff --git a/src/Manager/SignatureManager.cpp b/src/Manager/SignatureManager.cpp index cd9c9ea..b69ae70 100755 --- a/src/Manager/SignatureManager.cpp +++ b/src/Manager/SignatureManager.cpp @@ -244,7 +244,7 @@ SignatureManager::AddDistributorRootCert(X509CertificatePath* pCertPath) issuer = pIntermediateCA->GetIssuer(); - for(int certType = ROOT_CERTIFICATE_PUBLIC; certType <= ROOT_CERTIFICATE_PRIVATE; certType++) + for(int certType = ROOT_CERTIFICATE_PUBLIC; certType <= ROOT_CERTIFICATE_PARTNER_MANUFACTURER; certType++) { const char* pRootCert = null; ByteBuffer byteBuffer; @@ -305,7 +305,7 @@ SignatureManager::AddDistributorRootCert(X509CertificatePath* pCertPath) "UwLpLyqHiGQaASuADDeGEfcIqEf8gP1SzvnAZqLx9GchbOrOKRleooVFH7PRxFBS" "VWJ5Fq46dJ1mCgTWSkrL6dN5j9hWCzzGfv0Wco+NAf61n9kVbCv7AScIJwQNltOy"; } - else if (certType == ROOT_CERTIFICATE_PARTNER_MANUFACTURER) + else // ROOT_CERTIFICATE_PARTNER_MANUFACTURER { pRootCert = "MIIC1DCCAj2gAwIBAgIJAJZH47dCtgPdMA0GCSqGSIb3DQEBBQUAMIGiMQswCQYD" "VQQGEwJLUjEOMAwGA1UECAwFU3V3b24xDjAMBgNVBAcMBVN1d29uMRYwFAYDVQQK" @@ -324,24 +324,6 @@ SignatureManager::AddDistributorRootCert(X509CertificatePath* pCertPath) "Iy03/Up+JNfuom8JLgF7qc3YtbuJHzoVu1jJ/akXU6y52D/J5CkYy2JSsV0KZuh2" "ZeRWlV2f1Uo="; } - else // ROOT_CERTIFICATE_PRIVATE - { - pRootCert = "MIICujCCAiOgAwIBAgIJAMFWyIhkXFUVMA0GCSqGSIb3DQEBBQUAMIGVMQswCQYD" - "VQQGEwJLUjEOMAwGA1UECAwFU3V3b24xDjAMBgNVBAcMBVN1d29uMRYwFAYDVQQK" - "DA1UaXplbiBUZXN0IENBMSIwIAYDVQQLDBlUaXplbiBEaXN0cmlidXRvciBUZXN0" - "IENBMSowKAYDVQQDDCFUaXplbiBQcml2YXRlIERpc3RyaWJ1dG9yIFJvb3QgQ0Ew" - "HhcNMTIxMjEzMDU1MDM2WhcNMjIxMjExMDU1MDM2WjCBlTELMAkGA1UEBhMCS1Ix" - "DjAMBgNVBAgMBVN1d29uMQ4wDAYDVQQHDAVTdXdvbjEWMBQGA1UECgwNVGl6ZW4g" - "VGVzdCBDQTEiMCAGA1UECwwZVGl6ZW4gRGlzdHJpYnV0b3IgVGVzdCBDQTEqMCgG" - "A1UEAwwhVGl6ZW4gUHJpdmF0ZSBEaXN0cmlidXRvciBSb290IENBMIGfMA0GCSqG" - "SIb3DQEBAQUAA4GNADCBiQKBgQDSqcYGTmYKmsPNB7HJjhobKjaZXtRjmpStN0g5" - "vNnKa2azBMy9uI2DP8b1Qik0Un3jdUcVHNVW6Sf29eUlylB9OGX5e9ss7kk+VJUB" - "l2adTaEJP1Yj8/qghQFf97GJkKZsAZcJyUS57+Ipq4T7g4h+QyGrDw2jPCX9TJx9" - "JmfizwIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAIQc" - "zG1ZlLpyK9uKTkypvpd/rnR0WV9OMR4+74mHfRANZJ+KL9kVjWsWiLJCAbwaauo1" - "E9ta6D8P2V+sfzaJPvTXnobpDb86iNljKGgYjuB0AXoPHf52M0IbZ+YI6Tjj5REa" - "J8LPhyNYjT8xm9435LeDjNvssgXptfaKF0kfZ5NT"; - } length = strlen(pRootCert); byteBuffer.Construct(length); diff --git a/src/Step/SignatureStep.cpp b/src/Step/SignatureStep.cpp index 7f710d6..8a12fa2 100755 --- a/src/Step/SignatureStep.cpp +++ b/src/Step/SignatureStep.cpp @@ -212,10 +212,6 @@ SignatureStep::GetApiVisibility(RootCertificateType certType) { apiVisibility = _API_VISIBILITY_PARTNER_MANUFACTURER; } - else if (certType == ROOT_CERTIFICATE_PRIVATE) - { - apiVisibility = _API_VISIBILITY_PRIVATE; - } return apiVisibility; }