From 29682a28fb3034b0bf1e696c922132cf9f5888fb Mon Sep 17 00:00:00 2001 From: Dongsun Lee Date: Tue, 29 Jan 2019 17:56:58 +0900 Subject: [PATCH] Remove FINGERPRINT_LIST_RW_PATH Change-Id: I9cc1840acfca421c676190775924d3795180dc0c Signed-off-by: Dongsun Lee --- CMakeLists.txt | 1 - packaging/cert-svc.spec | 1 - src/vcore/ValidatorFactories.cpp | 7 ------- 3 files changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7a4e96..deff16c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,6 @@ SET(CA_CERTS_PATH ${RO_DATA_DIR}/ca-certificates) ADD_DEFINITIONS("-DTZ_SYS_CA_CERTS_TIZEN=\"${CA_CERTS_PATH}/tizen\"") ADD_DEFINITIONS("-DFINGERPRINT_LIST_PATH=\"${CA_CERTS_PATH}/fingerprint/fingerprint_list.xml\"") ADD_DEFINITIONS("-DFINGERPRINT_LIST_EXT_PATH=\"${CA_CERTS_PATH}/fingerprint/fingerprint_list_ext.xml\"") -ADD_DEFINITIONS("-DFINGERPRINT_LIST_RW_PATH=\"${FINGERPRINT_LIST_RW_PATH}\"") ADD_DEFINITIONS("-DFINGERPRINT_LIST_SCHEMA_PATH=\"${CA_CERTS_PATH}/fingerprint/fingerprint_list.xsd\"") CONFIGURE_FILE(cert-svc-vcore.pc.in cert-svc-vcore.pc @ONLY) diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec index 7226648..192c307 100644 --- a/packaging/cert-svc.spec +++ b/packaging/cert-svc.spec @@ -112,7 +112,6 @@ export FFLAGS="$FFLAGS -DTIZEN_EMULATOR_MODE" -DTZ_SYS_RO_CA_CERTS=%TZ_SYS_RO_CA_CERTS \ -DTZ_SYS_RO_CA_BUNDLE=%TZ_SYS_RO_CA_BUNDLE \ -DCERT_SVC_CA_BUNDLE=%cert_svc_ca_bundle \ - -DFINGERPRINT_LIST_RW_PATH=%TZ_SYS_REVOKED_CERTS_FINGERPRINTS_RUNTIME \ -DCERT_SVC_PATH=%cert_svc_path \ -DCERT_SVC_RO_PATH=%cert_svc_ro_path \ -DCERT_SVC_PKCS12=%cert_svc_pkcs12 \ diff --git a/src/vcore/ValidatorFactories.cpp b/src/vcore/ValidatorFactories.cpp index 7cfe247..fedb13d 100644 --- a/src/vcore/ValidatorFactories.cpp +++ b/src/vcore/ValidatorFactories.cpp @@ -56,13 +56,6 @@ const CertificateIdentifier &createCertificateIdentifier() exReader.read(certificateIdentifier); } - if (std::ifstream(FINGERPRINT_LIST_RW_PATH)) { - LogInfo(FINGERPRINT_LIST_RW_PATH << " exist, add it."); - CertificateConfigReader rwReader; - rwReader.initialize(FINGERPRINT_LIST_RW_PATH, schema); - rwReader.read(certificateIdentifier); - } - initialized = true; return certificateIdentifier; -- 2.7.4