From e1fa8ae7173b445694f5d820bf98c05d8dc80427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 1 Oct 2024 20:18:48 +0100 Subject: [PATCH] Remove all references to pccs service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The PCCS code was deleted in the DCAP 1.22 release that SGX references, resulting in a failure to build the installers for DCAP / TDX. e.g. $ /usr/bin/make -I linux/installer/common/psw-dcap -f linux/installer/common/psw-dcap/Makefile SRCDIR=. DESTDIR=build/vroot/psw install ...snip... python /var/home/berrange/rpmbuild/BUILD/linux-sgx-sgx_2.25_reproducible/linux/installer/common/gen_source/copy_source.py --bom-file /var/home/berrange/rpmbuild/BUILD/linux-sgx-sgx_2.25_reproducible/linux/installer/common/psw-dcap/BOM_install/sgx-dcap-pccs.txt --src-path . --dst-path build/pkgroot/sgx-dcap-pccs Error: src directory/file ./external/dcap_source/QuoteGeneration/pccs/config/default.json does not exist! make: *** [linux/installer/common/psw-dcap/Makefile:195: pre_sgx-dcap-pccs] Error 1 Remove all traces of PCCS from the installer. Signed-off-by: Daniel P. Berrangé --- README.md | 4 - .../psw-dcap/BOM_install/sgx-dcap-pccs.txt | 74 ------------------- linux/installer/common/psw-dcap/Makefile | 14 +--- linux/installer/common/psw-dcap/installConfig | 1 - .../psw-tdx/BOM_install/sgx-dcap-pccs.txt | 74 ------------------- linux/installer/common/psw-tdx/Makefile | 14 +--- linux/installer/common/psw-tdx/installConfig | 1 - linux/installer/rpm/psw-dcap/build.sh | 1 - .../installer/rpm/psw-dcap/psw-dcap.spec.tmpl | 21 +----- linux/installer/rpm/psw-tdx/build.sh | 1 - linux/installer/rpm/psw-tdx/psw-tdx.spec.tmpl | 21 +----- 11 files changed, 6 insertions(+), 220 deletions(-) delete mode 100644 linux/installer/common/psw-dcap/BOM_install/sgx-dcap-pccs.txt delete mode 100644 linux/installer/common/psw-tdx/BOM_install/sgx-dcap-pccs.txt diff --git a/README.md b/README.md index 79e2deada..9d7ca7e66 100644 --- a/README.md +++ b/README.md @@ -523,10 +523,6 @@ Please follow the [Intel(R) SGX DCAP Installation Guide for Linux* OS](https://d - Install Quote Provider Library(QPL). You can use your own customized QPL or use default QPL provided by Intel(libsgx-dcap-default-qpl) -- Install PCK Caching Service. For how to install and configure PCK Caching -Service, please refer to [SGXDataCenterAttestationPrimitives](https://github.com/intel/SGXDataCenterAttestationPrimitives/tree/DCAP_1.21/QuoteGeneration/pccs) -- Ensure the PCK Caching Service is setup correctly by local administrator or data center administrator. Also make sure that the configure file of quote provider library (/etc/sgx_default_qcnl.conf) is consistent with the real environment, for example: PCS_URL=https://your_pcs_server:8081/sgx/certification/v1/ - ### Start or Stop aesmd Service The Intel(R) SGX PSW installer installs an aesmd service in your machine, which is running in a special linux account `aesmd`. To stop the service: `$ sudo service aesmd stop` diff --git a/linux/installer/common/psw-dcap/BOM_install/sgx-dcap-pccs.txt b/linux/installer/common/psw-dcap/BOM_install/sgx-dcap-pccs.txt deleted file mode 100644 index d70745c97..000000000 --- a/linux/installer/common/psw-dcap/BOM_install/sgx-dcap-pccs.txt +++ /dev/null @@ -1,74 +0,0 @@ -DeliveryName InstallName FileCheckSum FileFeature FileOwner -/external/dcap_source/QuoteGeneration/pccs/config/default.json /config/default.json 0 main STP -/external/dcap_source/QuoteGeneration/pccs/constants/index.js /constants/index.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/constants/pccs_status_code.js /constants/pccs_status_code.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/identityController.js /controllers/identityController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/index.js /controllers/index.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/pckcertController.js /controllers/pckcertController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/pckcrlController.js /controllers/pckcrlController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/platformCollateralController.js /controllers/platformCollateralController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/platformsController.js /controllers/platformsController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/refreshController.js /controllers/refreshController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/rootcacrlController.js /controllers/rootcacrlController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/tcbinfoController.js /controllers/tcbinfoController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/crlController.js /controllers/crlController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/fmspc_tcbs.js /dao/models/fmspc_tcbs.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/index.js /dao/models/index.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/pck_cert.js /dao/models/pck_cert.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/pck_certchain.js /dao/models/pck_certchain.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/pck_crl.js /dao/models/pck_crl.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/pcs_certificates.js /dao/models/pcs_certificates.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/pcs_version.js /dao/models/pcs_version.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/platform_tcbs.js /dao/models/platform_tcbs.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/platforms_registered.js /dao/models/platforms_registered.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/platforms.js /dao/models/platforms.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/enclave_identities.js /dao/models/enclave_identities.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/crl_cache.js /dao/models/crl_cache.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/fmspcTcbDao.js /dao/fmspcTcbDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/pckCertchainDao.js /dao/pckCertchainDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/pckcertDao.js /dao/pckcertDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/pckcrlDao.js /dao/pckcrlDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/pcsCertificatesDao.js /dao/pcsCertificatesDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/pcsVersionDao.js /dao/pcsVersionDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/platformsDao.js /dao/platformsDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/platformsRegDao.js /dao/platformsRegDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/platformTcbsDao.js /dao/platformTcbsDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/enclaveIdentityDao.js /dao/enclaveIdentityDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/crlCacheDao.js /dao/crlCacheDao.js 0 main STP -/external/dcap_source/tools/PCKCertSelection/out/libPCKCertSelection.so /lib/libPCKCertSelection.so 0 main STP -/external/dcap_source/QuoteGeneration/pccs/lib_wrapper/pcklib_wrapper.js /lib_wrapper/pcklib_wrapper.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/middleware/auth.js /middleware/auth.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/middleware/error.js /middleware/error.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/middleware/addRequestId.js /middleware/addRequestId.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/migrations/00_db_initialize.up.sql /migrations/00_db_initialize.up.sql 0 main STP -/external/dcap_source/QuoteGeneration/pccs/migrations/01_db_version_1.js /migrations/01_db_version_1.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/migrations/02_db_version_2.js /migrations/02_db_version_2.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/pcs_client/pcs_client.js /pcs_client/pcs_client.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/routes/index.js /routes/index.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/identityService.js /services/identityService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/index.js /services/index.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/pccs_schemas.js /services/pccs_schemas.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/pckcertService.js /services/pckcertService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/pckcrlService.js /services/pckcrlService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/platformCollateralService.js /services/platformCollateralService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/platformsRegService.js /services/platformsRegService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/platformsService.js /services/platformsService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/refreshService.js /services/refreshService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/rootcacrlService.js /services/rootcacrlService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/tcbinfoService.js /services/tcbinfoService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/crlService.js /services/crlService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/caching_modes/cachingMode.js /services/caching_modes/cachingMode.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/caching_modes/cachingModeManager.js /services/caching_modes/cachingModeManager.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/logic/commonCacheLogic.js /services/logic/commonCacheLogic.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/logic/qvCollateralLogic.js /services/logic/qvCollateralLogic.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/utils/Logger.js /utils/Logger.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/utils/PccsError.js /utils/PccsError.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/utils/apputil.js /utils/apputil.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/x509/x509.js /x509/x509.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/install.sh /install.sh 0 main STP -/external/dcap_source/QuoteGeneration/pccs/package.json /package.json 0 main STP -/external/dcap_source/QuoteGeneration/pccs/pccs_server.js /pccs_server.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/pccs.service /pccs.service 0 main STP -/external/dcap_source/QuoteGeneration/pccs/startup.sh /startup.sh 0 main STP -/external/dcap_source/QuoteGeneration/pccs/cleanup.sh /cleanup.sh 0 main STP -/external/dcap_source/QuoteGeneration/pccs/README.md /README.md 0 main STP diff --git a/linux/installer/common/psw-dcap/Makefile b/linux/installer/common/psw-dcap/Makefile index a85c8b825..5e8a8560d 100644 --- a/linux/installer/common/psw-dcap/Makefile +++ b/linux/installer/common/psw-dcap/Makefile @@ -95,9 +95,6 @@ AESMD_CONF=aesmd.service AESMD_CONF_DEL=aesmd.conf AESMD_CONF_PATH=$(if $(wildcard /lib/systemd/system/.),/lib/systemd/system,/usr/lib/systemd/system) -PCCS_CONF=pccs.service -PCCS_CONF_PATH=$(if $(wildcard /lib/systemd/system/.),/lib/systemd/system,/usr/lib/systemd/system) - RAD_CONF=mpa_registration_tool.service RAD_CONF_DEL=mpa_registration_tool.conf RAD_CONF_PATH=$(if $(wildcard /lib/systemd/system/.),/lib/systemd/system,/usr/lib/systemd/system) @@ -192,7 +189,7 @@ ALL_PKGS:= $(AESM_SERVICE_PKGS) $(AE_PKGS) $(DEV_LIB_PKGS) $(foreach PKG,$(AESM_SERVICE_PKGS) $(AE_PKGS),$(eval $(call INSTALL_AESM_SERVICE_TEMPLATE,$(PKG)))) $(foreach PKG,$(DEV_LIB_PKGS),$(eval $(call INSTALL_DEV_LIB_TEMPLATE,$(PKG)))) -$(foreach PKG,$(ALL_PKGS) $(DCAP_PCCS_PACKAGE) $(RA_SERVICE_PACKAGE) $(PCK_ID_RETRIEVAL_TOOL_PACKAGE),$(eval $(call PRE_INSTALL_TEMPLATE,$(PKG)))) +$(foreach PKG,$(ALL_PKGS) $(RA_SERVICE_PACKAGE) $(PCK_ID_RETRIEVAL_TOOL_PACKAGE),$(eval $(call PRE_INSTALL_TEMPLATE,$(PKG)))) PHONY+=$(ALL_PKGS) PHONY+=$(foreach PKG,$(ALL_PKGS),pre_$(PKG)) @@ -220,14 +217,6 @@ install_$(AESM_SERVICE_PACKAGE): $(foreach PKG,$(AESM_SERVICE_PKGS),post_$(PKG)) ln -fs $(shell readlink -m $(USR_LIB_PATH)/libsgx_pce.signed.so) && \ ln -fs liburts_internal.so libsgx_urts.so.$(URTS_MAJOR_VER) -PHONY+=install_$(DCAP_PCCS_PACKAGE) -install_$(DCAP_PCCS_PACKAGE): pre_$(DCAP_PCCS_PACKAGE) | $(PACKAGE_ROOT_PATH) - install -d $(shell readlink -m $(DESTDIR)/$(DCAP_PCCS_PACKAGE)/$(PCCS_CONF_PATH)) && \ - cp -f $|/$(DCAP_PCCS_PACKAGE)/$(PCCS_CONF) $(DESTDIR)/$(DCAP_PCCS_PACKAGE)/$(PCCS_CONF_PATH) && \ - rm -f $|/$(DCAP_PCCS_PACKAGE)/$(PCCS_CONF) - install -d $(shell readlink -m $(DESTDIR)/$(DCAP_PCCS_PACKAGE)/$(SGX_INSTALL_PATH)/$(DCAP_PCCS_PACKAGE)) && \ - cp -fr $|/$(DCAP_PCCS_PACKAGE)/* $(DESTDIR)/$(DCAP_PCCS_PACKAGE)/$(SGX_INSTALL_PATH)/$(DCAP_PCCS_PACKAGE) - PHONY+=$(RA_SERVICE_PACKAGE) $(RA_SERVICE_PACKAGE): pre_$(RA_SERVICE_PACKAGE) | $(PACKAGE_ROOT_PATH) install -d $(shell readlink -m $(DESTDIR)/$@/$(SGX_INSTALL_PATH)/$@) && \ @@ -351,7 +340,6 @@ install_dev_lib: $(foreach PKG,$(DEV_LIB_PKGS),post_$(PKG)) PHONY+=install install: install_$(AESM_SERVICE_PACKAGE) \ - install_$(DCAP_PCCS_PACKAGE) \ install_$(RA_SERVICE_PACKAGE) \ install_$(PCK_ID_RETRIEVAL_TOOL_PACKAGE) \ install_ae \ diff --git a/linux/installer/common/psw-dcap/installConfig b/linux/installer/common/psw-dcap/installConfig index 9f99f0329..96acdd9ae 100644 --- a/linux/installer/common/psw-dcap/installConfig +++ b/linux/installer/common/psw-dcap/installConfig @@ -30,7 +30,6 @@ DCAP_QL_PACKAGE=libsgx-dcap-ql DCAP_QL_DEV_PACKAGE=libsgx-dcap-ql-devel DCAP_QVL_PACKAGE=libsgx-dcap-quote-verify DCAP_QVL_DEV_PACKAGE=libsgx-dcap-quote-verify-devel -DCAP_PCCS_PACKAGE=sgx-dcap-pccs PCK_ID_RETRIEVAL_TOOL_PACKAGE=sgx-pck-id-retrieval-tool RA_NETWORK_PACKAGE=libsgx-ra-network diff --git a/linux/installer/common/psw-tdx/BOM_install/sgx-dcap-pccs.txt b/linux/installer/common/psw-tdx/BOM_install/sgx-dcap-pccs.txt deleted file mode 100644 index d70745c97..000000000 --- a/linux/installer/common/psw-tdx/BOM_install/sgx-dcap-pccs.txt +++ /dev/null @@ -1,74 +0,0 @@ -DeliveryName InstallName FileCheckSum FileFeature FileOwner -/external/dcap_source/QuoteGeneration/pccs/config/default.json /config/default.json 0 main STP -/external/dcap_source/QuoteGeneration/pccs/constants/index.js /constants/index.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/constants/pccs_status_code.js /constants/pccs_status_code.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/identityController.js /controllers/identityController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/index.js /controllers/index.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/pckcertController.js /controllers/pckcertController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/pckcrlController.js /controllers/pckcrlController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/platformCollateralController.js /controllers/platformCollateralController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/platformsController.js /controllers/platformsController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/refreshController.js /controllers/refreshController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/rootcacrlController.js /controllers/rootcacrlController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/tcbinfoController.js /controllers/tcbinfoController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/controllers/crlController.js /controllers/crlController.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/fmspc_tcbs.js /dao/models/fmspc_tcbs.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/index.js /dao/models/index.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/pck_cert.js /dao/models/pck_cert.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/pck_certchain.js /dao/models/pck_certchain.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/pck_crl.js /dao/models/pck_crl.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/pcs_certificates.js /dao/models/pcs_certificates.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/pcs_version.js /dao/models/pcs_version.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/platform_tcbs.js /dao/models/platform_tcbs.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/platforms_registered.js /dao/models/platforms_registered.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/platforms.js /dao/models/platforms.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/enclave_identities.js /dao/models/enclave_identities.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/models/crl_cache.js /dao/models/crl_cache.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/fmspcTcbDao.js /dao/fmspcTcbDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/pckCertchainDao.js /dao/pckCertchainDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/pckcertDao.js /dao/pckcertDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/pckcrlDao.js /dao/pckcrlDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/pcsCertificatesDao.js /dao/pcsCertificatesDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/pcsVersionDao.js /dao/pcsVersionDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/platformsDao.js /dao/platformsDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/platformsRegDao.js /dao/platformsRegDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/platformTcbsDao.js /dao/platformTcbsDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/enclaveIdentityDao.js /dao/enclaveIdentityDao.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/dao/crlCacheDao.js /dao/crlCacheDao.js 0 main STP -/external/dcap_source/tools/PCKCertSelection/out/libPCKCertSelection.so /lib/libPCKCertSelection.so 0 main STP -/external/dcap_source/QuoteGeneration/pccs/lib_wrapper/pcklib_wrapper.js /lib_wrapper/pcklib_wrapper.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/middleware/auth.js /middleware/auth.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/middleware/error.js /middleware/error.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/middleware/addRequestId.js /middleware/addRequestId.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/migrations/00_db_initialize.up.sql /migrations/00_db_initialize.up.sql 0 main STP -/external/dcap_source/QuoteGeneration/pccs/migrations/01_db_version_1.js /migrations/01_db_version_1.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/migrations/02_db_version_2.js /migrations/02_db_version_2.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/pcs_client/pcs_client.js /pcs_client/pcs_client.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/routes/index.js /routes/index.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/identityService.js /services/identityService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/index.js /services/index.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/pccs_schemas.js /services/pccs_schemas.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/pckcertService.js /services/pckcertService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/pckcrlService.js /services/pckcrlService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/platformCollateralService.js /services/platformCollateralService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/platformsRegService.js /services/platformsRegService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/platformsService.js /services/platformsService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/refreshService.js /services/refreshService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/rootcacrlService.js /services/rootcacrlService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/tcbinfoService.js /services/tcbinfoService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/crlService.js /services/crlService.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/caching_modes/cachingMode.js /services/caching_modes/cachingMode.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/caching_modes/cachingModeManager.js /services/caching_modes/cachingModeManager.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/logic/commonCacheLogic.js /services/logic/commonCacheLogic.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/services/logic/qvCollateralLogic.js /services/logic/qvCollateralLogic.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/utils/Logger.js /utils/Logger.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/utils/PccsError.js /utils/PccsError.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/utils/apputil.js /utils/apputil.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/x509/x509.js /x509/x509.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/install.sh /install.sh 0 main STP -/external/dcap_source/QuoteGeneration/pccs/package.json /package.json 0 main STP -/external/dcap_source/QuoteGeneration/pccs/pccs_server.js /pccs_server.js 0 main STP -/external/dcap_source/QuoteGeneration/pccs/pccs.service /pccs.service 0 main STP -/external/dcap_source/QuoteGeneration/pccs/startup.sh /startup.sh 0 main STP -/external/dcap_source/QuoteGeneration/pccs/cleanup.sh /cleanup.sh 0 main STP -/external/dcap_source/QuoteGeneration/pccs/README.md /README.md 0 main STP diff --git a/linux/installer/common/psw-tdx/Makefile b/linux/installer/common/psw-tdx/Makefile index 4f50ee49f..0e8cb3e76 100644 --- a/linux/installer/common/psw-tdx/Makefile +++ b/linux/installer/common/psw-tdx/Makefile @@ -80,9 +80,6 @@ QGSD_CONF=qgsd.service QGSD_CONF_DEL=qgsd.conf QGSD_CONF_PATH=$(if $(wildcard /lib/systemd/system/.),/lib/systemd/system,/usr/lib/systemd/system) -PCCS_CONF=pccs.service -PCCS_CONF_PATH=$(if $(wildcard /lib/systemd/system/.),/lib/systemd/system,/usr/lib/systemd/system) - RAD_CONF=mpa_registration_tool.service RAD_CONF_DEL=mpa_registration_tool.conf RAD_CONF_PATH=$(if $(wildcard /lib/systemd/system/.),/lib/systemd/system,/usr/lib/systemd/system) @@ -160,7 +157,7 @@ ALL_PKGS:= $(TDX_QGS_PKGS) $(AE_PKGS) $(DEV_LIB_PKGS) $(foreach PKG,$(TDX_QGS_PKGS) $(AE_PKGS),$(eval $(call INSTALL_AESM_SERVICE_TEMPLATE,$(PKG)))) $(foreach PKG,$(DEV_LIB_PKGS),$(eval $(call INSTALL_DEV_LIB_TEMPLATE,$(PKG)))) -$(foreach PKG,$(ALL_PKGS) $(DCAP_PCCS_PACKAGE) $(RA_SERVICE_PACKAGE) $(PCK_ID_RETRIEVAL_TOOL_PACKAGE),$(eval $(call PRE_INSTALL_TEMPLATE,$(PKG)))) +$(foreach PKG,$(ALL_PKGS) $(RA_SERVICE_PACKAGE) $(PCK_ID_RETRIEVAL_TOOL_PACKAGE),$(eval $(call PRE_INSTALL_TEMPLATE,$(PKG)))) PHONY+=$(ALL_PKGS) PHONY+=$(foreach PKG,$(ALL_PKGS),pre_$(PKG)) @@ -184,14 +181,6 @@ install_$(TDX_QGS_PACKAGE): $(foreach PKG,$(TDX_QGS_PKGS),post_$(PKG)) $(DESTDIR)/$(TDX_QGS_PACKAGE)/$(ETC_DIR) && \ rm -fr $(DESTDIR)/$(TDX_QGS_PACKAGE)/$(SGX_INSTALL_PATH)/$(TDX_QGS_PACKAGE)/conf)) -PHONY+=install_$(DCAP_PCCS_PACKAGE) -install_$(DCAP_PCCS_PACKAGE): pre_$(DCAP_PCCS_PACKAGE) | $(PACKAGE_ROOT_PATH) - install -d $(shell readlink -m $(DESTDIR)/$(DCAP_PCCS_PACKAGE)/$(PCCS_CONF_PATH)) && \ - cp -f $|/$(DCAP_PCCS_PACKAGE)/$(PCCS_CONF) $(DESTDIR)/$(DCAP_PCCS_PACKAGE)/$(PCCS_CONF_PATH) && \ - rm -f $|/$(DCAP_PCCS_PACKAGE)/$(PCCS_CONF) - install -d $(shell readlink -m $(DESTDIR)/$(DCAP_PCCS_PACKAGE)/$(SGX_INSTALL_PATH)/$(DCAP_PCCS_PACKAGE)) && \ - cp -fr $|/$(DCAP_PCCS_PACKAGE)/* $(DESTDIR)/$(DCAP_PCCS_PACKAGE)/$(SGX_INSTALL_PATH)/$(DCAP_PCCS_PACKAGE) - PHONY+=$(RA_SERVICE_PACKAGE) $(RA_SERVICE_PACKAGE): pre_$(RA_SERVICE_PACKAGE) | $(PACKAGE_ROOT_PATH) install -d $(shell readlink -m $(DESTDIR)/$@/$(SGX_INSTALL_PATH)/$@) && \ @@ -291,7 +280,6 @@ install_dev_lib: $(foreach PKG,$(DEV_LIB_PKGS),post_$(PKG)) PHONY+=install install: install_$(TDX_QGS_PACKAGE) \ - install_$(DCAP_PCCS_PACKAGE) \ install_$(RA_SERVICE_PACKAGE) \ install_$(PCK_ID_RETRIEVAL_TOOL_PACKAGE) \ install_ae \ diff --git a/linux/installer/common/psw-tdx/installConfig b/linux/installer/common/psw-tdx/installConfig index 7129b71dc..c55a8ada1 100644 --- a/linux/installer/common/psw-tdx/installConfig +++ b/linux/installer/common/psw-tdx/installConfig @@ -16,7 +16,6 @@ TDX_ATTEST_PACKAGE=libtdx-attest TDX_ATTEST_DEV_PACKAGE=libtdx-attest-devel DCAP_QVL_PACKAGE=libsgx-dcap-quote-verify DCAP_QVL_DEV_PACKAGE=libsgx-dcap-quote-verify-devel -DCAP_PCCS_PACKAGE=sgx-dcap-pccs PCK_ID_RETRIEVAL_TOOL_PACKAGE=sgx-pck-id-retrieval-tool RA_NETWORK_PACKAGE=libsgx-ra-network RA_NETWORK_DEV_PACKAGE=libsgx-ra-network-devel diff --git a/linux/installer/rpm/psw-dcap/build.sh b/linux/installer/rpm/psw-dcap/build.sh index 22c8eef5a..6188e816f 100755 --- a/linux/installer/rpm/psw-dcap/build.sh +++ b/linux/installer/rpm/psw-dcap/build.sh @@ -63,7 +63,6 @@ update_spec() { -e "s:@dcap_version@:${dcap_version}:" \ -e "s:@aesm_service_path@:${SGX_INSTALL_PATH}/${AESM_SERVICE_PACKAGE}:" \ -e "s:@ra_service_path@:${SGX_INSTALL_PATH}/${RA_SERVICE_PACKAGE}:" \ - -e "s:@dcap_pccs_path@:${SGX_INSTALL_PATH}/${DCAP_PCCS_PACKAGE}:" \ -e "s:@pck_id_retrieval_tool_path@:${SGX_INSTALL_PATH}/${PCK_ID_RETRIEVAL_TOOL_PACKAGE}:" \ ${cur_dir}/${psw_dcap}.spec.tmpl > ${cur_dir}/${rpm_build_dir}/SPECS/${psw_dcap}.spec diff --git a/linux/installer/rpm/psw-dcap/psw-dcap.spec.tmpl b/linux/installer/rpm/psw-dcap/psw-dcap.spec.tmpl index c7ba4c123..66fc4a788 100644 --- a/linux/installer/rpm/psw-dcap/psw-dcap.spec.tmpl +++ b/linux/installer/rpm/psw-dcap/psw-dcap.spec.tmpl @@ -31,7 +31,6 @@ %define _aesm_service_path @aesm_service_path@ %define _ra_service_path @ra_service_path@ -%define _dcap_pccs_path @dcap_pccs_path@ %define _pck_id_retrieval_tool_path @pck_id_retrieval_tool_path@ %define _psw_version @psw_version@ %define _dcap_version @dcap_version@ @@ -303,14 +302,6 @@ Requires: libsgx-dcap-quote-verify = %{version}-%{release} libsgx-headers > %description -n libsgx-dcap-quote-verify-devel Intel(R) Software Guard Extensions Data Center Attestation Primitives Quote Verification Library for Developers -%package -n sgx-dcap-pccs -Version: %{_dcap_version} -Summary: Intel(R) Software Guard Extensions PCK Caching Service -Requires: gcc gcc-c++ make - -%description -n sgx-dcap-pccs -Intel(R) Software Guard Extensions PCK Caching Service - %package -n libsgx-ra-network Version: %{_dcap_version} Summary: Intel(R) Software Guard Extensions Registration Agent Network Library @@ -378,14 +369,13 @@ for pkg in $(ls -A %{?buildroot} 2> /dev/null |grep -v "license"); do grep -v "^%{_includedir}" | \ grep -v "^%{_sysconfdir}" | \ grep -v "^%{_aesm_service_path}" | \ - grep -v "^%{_dcap_pccs_path}" | \ grep -v "^%{_ra_service_path}" | \ grep -v "^%{_pck_id_retrieval_tool_path}" | \ sed -e "s#^#%dir #" > %{_specdir}/list-${pkg} for f in $(find %{?buildroot}/${pkg}); do if [ -d ${f} ]; then echo ${f} | sed -e "s#^%{?buildroot}/${pkg}##" | \ - grep -E "^%{_aesm_service_path}|^%{_dcap_pccs_path}|^%{_ra_service_path}|^%{_pck_id_retrieval_tool_path}" | \ + grep -E "^%{_aesm_service_path}|^%{_ra_service_path}|^%{_pck_id_retrieval_tool_path}" | \ sed -e "s#^#%dir #" >> %{_specdir}/list-${pkg} else echo ${f} | \ @@ -395,7 +385,7 @@ for pkg in $(ls -A %{?buildroot} 2> /dev/null |grep -v "license"); do cp -r %{?buildroot}/${pkg}/* %{?buildroot}/ rm -fr %{?buildroot}/${pkg} sed -i -e 's:^/etc/.*\.conf:%config &:' \ - -e 's:^%{_dcap_pccs_path}/config/default\.json:%config &:' %{_specdir}/list-${pkg} + %{_specdir}/list-${pkg} done rm -fr %{?buildroot}/license @@ -433,7 +423,6 @@ make clean %files -n libsgx-dcap-ql-devel -f %{_specdir}/list-libsgx-dcap-ql-devel %files -n libsgx-dcap-quote-verify -f %{_specdir}/list-libsgx-dcap-quote-verify %files -n libsgx-dcap-quote-verify-devel -f %{_specdir}/list-libsgx-dcap-quote-verify-devel -%files -n sgx-dcap-pccs -f %{_specdir}/list-sgx-dcap-pccs %files -n libsgx-ra-network -f %{_specdir}/list-libsgx-ra-network %files -n libsgx-ra-network-devel -f %{_specdir}/list-libsgx-ra-network-devel %files -n libsgx-ra-uefi -f %{_specdir}/list-libsgx-ra-uefi @@ -447,12 +436,6 @@ if [ -x %{_aesm_service_path}/startup.sh ]; then %{_aesm_service_path}/startup.s %preun if [ -x %{_aesm_service_path}/cleanup.sh ]; then %{_aesm_service_path}/cleanup.sh; fi -%posttrans -n sgx-dcap-pccs -if [ -x %{_dcap_pccs_path}/startup.sh ]; then %{_dcap_pccs_path}/startup.sh; fi - -%preun -n sgx-dcap-pccs -if [ -x %{_dcap_pccs_path}/cleanup.sh ]; then %{_dcap_pccs_path}/cleanup.sh; fi - %posttrans -n sgx-ra-service if [ -x %{_ra_service_path}/startup.sh ]; then %{_ra_service_path}/startup.sh; fi diff --git a/linux/installer/rpm/psw-tdx/build.sh b/linux/installer/rpm/psw-tdx/build.sh index f42d6bd2e..25a683c85 100755 --- a/linux/installer/rpm/psw-tdx/build.sh +++ b/linux/installer/rpm/psw-tdx/build.sh @@ -63,7 +63,6 @@ update_spec() { -e "s:@dcap_version@:${dcap_version}:" \ -e "s:@tdx_qgs_path@:${SGX_INSTALL_PATH}/${TDX_QGS_PACKAGE}:" \ -e "s:@ra_service_path@:${SGX_INSTALL_PATH}/${RA_SERVICE_PACKAGE}:" \ - -e "s:@dcap_pccs_path@:${SGX_INSTALL_PATH}/${DCAP_PCCS_PACKAGE}:" \ -e "s:@pck_id_retrieval_tool_path@:${SGX_INSTALL_PATH}/${PCK_ID_RETRIEVAL_TOOL_PACKAGE}:" \ ${cur_dir}/${psw_tdx}.spec.tmpl > ${cur_dir}/${rpm_build_dir}/SPECS/${psw_tdx}.spec diff --git a/linux/installer/rpm/psw-tdx/psw-tdx.spec.tmpl b/linux/installer/rpm/psw-tdx/psw-tdx.spec.tmpl index 0dd5fd8c6..67eab01ac 100644 --- a/linux/installer/rpm/psw-tdx/psw-tdx.spec.tmpl +++ b/linux/installer/rpm/psw-tdx/psw-tdx.spec.tmpl @@ -31,7 +31,6 @@ %define _tdx_qgs_path @tdx_qgs_path@ %define _ra_service_path @ra_service_path@ -%define _dcap_pccs_path @dcap_pccs_path@ %define _pck_id_retrieval_tool_path @pck_id_retrieval_tool_path@ %define _psw_version @psw_version@ %define _dcap_version @dcap_version@ @@ -198,14 +197,6 @@ Requires: libsgx-dcap-quote-verify = %{version}-%{release} libsgx-headers > %description -n libsgx-dcap-quote-verify-devel Intel(R) Software Guard Extensions Data Center Attestation Primitives Quote Verification Library for Developers -%package -n sgx-dcap-pccs -Version: %{_dcap_version} -Summary: Intel(R) Software Guard Extensions PCK Caching Service -Requires: gcc gcc-c++ make - -%description -n sgx-dcap-pccs -Intel(R) Software Guard Extensions PCK Caching Service - %package -n libsgx-ra-network Version: %{_dcap_version} Summary: Intel(R) Software Guard Extensions Registration Agent Network Library @@ -273,14 +264,13 @@ for pkg in $(ls -A %{?buildroot} 2> /dev/null |grep -v "license"); do grep -v "^%{_includedir}" | \ grep -v "^%{_sysconfdir}" | \ grep -v "^%{_tdx_qgs_path}" | \ - grep -v "^%{_dcap_pccs_path}" | \ grep -v "^%{_ra_service_path}" | \ grep -v "^%{_pck_id_retrieval_tool_path}" | \ sed -e "s#^#%dir #" > %{_specdir}/list-${pkg} for f in $(find %{?buildroot}/${pkg}); do if [ -d ${f} ]; then echo ${f} | sed -e "s#^%{?buildroot}/${pkg}##" | \ - grep -E "^%{_tdx_qgs_path}|^%{_dcap_pccs_path}|^%{_ra_service_path}|^%{_pck_id_retrieval_tool_path}" | \ + grep -E "^%{_tdx_qgs_path}|^%{_ra_service_path}|^%{_pck_id_retrieval_tool_path}" | \ sed -e "s#^#%dir #" >> %{_specdir}/list-${pkg} else echo ${f} | \ @@ -290,7 +280,7 @@ for pkg in $(ls -A %{?buildroot} 2> /dev/null |grep -v "license"); do cp -r %{?buildroot}/${pkg}/* %{?buildroot}/ rm -fr %{?buildroot}/${pkg} sed -i -e 's:^/etc/.*\.conf:%config &:' \ - -e 's:^%{_dcap_pccs_path}/config/default\.json:%config &:' %{_specdir}/list-${pkg} + %{_specdir}/list-${pkg} done rm -fr %{?buildroot}/license @@ -315,7 +305,6 @@ make clean %files -n libtdx-attest-devel -f %{_specdir}/list-libtdx-attest-devel %files -n libsgx-dcap-quote-verify -f %{_specdir}/list-libsgx-dcap-quote-verify %files -n libsgx-dcap-quote-verify-devel -f %{_specdir}/list-libsgx-dcap-quote-verify-devel -%files -n sgx-dcap-pccs -f %{_specdir}/list-sgx-dcap-pccs %files -n libsgx-ra-network -f %{_specdir}/list-libsgx-ra-network %files -n libsgx-ra-network-devel -f %{_specdir}/list-libsgx-ra-network-devel %files -n libsgx-ra-uefi -f %{_specdir}/list-libsgx-ra-uefi @@ -329,12 +318,6 @@ if [ -x %{_tdx_qgs_path}/startup.sh ]; then %{_tdx_qgs_path}/startup.sh; fi %preun if [ -x %{_tdx_qgs_path}/cleanup.sh ]; then %{_tdx_qgs_path}/cleanup.sh; fi -%posttrans -n sgx-dcap-pccs -if [ -x %{_dcap_pccs_path}/startup.sh ]; then %{_dcap_pccs_path}/startup.sh; fi - -%preun -n sgx-dcap-pccs -if [ -x %{_dcap_pccs_path}/cleanup.sh ]; then %{_dcap_pccs_path}/cleanup.sh; fi - %posttrans -n sgx-ra-service if [ -x %{_ra_service_path}/startup.sh ]; then %{_ra_service_path}/startup.sh; fi