Linux 2.10 Open Source Gold Release

Provided a reproducible SDK.
Supported new OS: RHEL 8.1, CentOS 8.1 and Fedora 31.
Supported user to specify platform id in PCK Cert ID Retrieval Tool’s command line option.
Added ability to execute Platform Cert ID Retrieval Tool on multi-package platforms without
  loading enclaves. PCCS now supports this functionality. The platform still needs to support
  SGX.
Updated Platform Cert ID Retrieval Tool and Multi-package registration tool to align with BIOS
  platform manifest changes.
Added .deb and .rpm installers for Platform Cert ID Retrieval Tool and Multi-package
  Registration Agent.
Fixed bugs.

Signed-off-by: Li, Xun <[email protected]>

Author: llly

.gitmodules

@@ -9,3 +9,7 @@
 	path = external/dnnl/dnnl
 	url = https://github.com/intel/mkl-dnn.git
 	branch = rls-v1.1
+[submodule "ipp-crypto"]
+	path = external/ippcp_internal/ipp-crypto
+	url = https://github.com/intel/ipp-crypto.git
+	branch = ipp-crypto_2019_update5

Makefile

@@ -29,7 +29,7 @@
 #
 #
 
-DCAP_VER?= 1.6
+DCAP_VER?= 1.7
 DCAP_DOWNLOAD_BASE ?= https://github.com/intel/SGXDataCenterAttestationPrimitives/archive
 
 CHECK_OPT :=
@@ -69,16 +69,24 @@ endif
 psw: $(CHECK_OPT)
 	$(MAKE) -C psw/ USE_OPT_LIBS=$(USE_OPT_LIBS)
 
-sdk_no_mitigation: 
+sdk_no_mitigation: $(CHECK_OPT)
 	$(MAKE) -C sdk/ USE_OPT_LIBS=$(USE_OPT_LIBS)
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl clean
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl
 
-sdk:
+sdk: $(CHECK_OPT)
 	$(MAKE) -C sdk/ clean
 	$(MAKE) -C sdk/ MODE=$(MODE) MITIGATION-CVE-2020-0551=LOAD
 	$(MAKE) -C sdk/ clean
 	$(MAKE) -C sdk/ MODE=$(MODE) MITIGATION-CVE-2020-0551=CF
 	$(MAKE) -C sdk/ clean
 	$(MAKE) -C sdk/ MODE=$(MODE)
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl MITIGATION-CVE-2020-0551=LOAD clean
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl MITIGATION-CVE-2020-0551=LOAD
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl MITIGATION-CVE-2020-0551=CF clean
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl MITIGATION-CVE-2020-0551=CF
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl clean
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl
 
 # Generate SE SDK Install package
 sdk_install_pkg_no_mitigation: sdk_no_mitigation
@@ -106,16 +114,6 @@ deb_libsgx_pce_logic: psw
 	$(MAKE) -C external/dcap_source/QuoteGeneration deb_sgx_pce_logic_pkg
 	$(CP) external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-pce-logic/libsgx-pce-logic*deb ./linux/installer/deb/sgx-aesm-service/
 
-.PHONY: deb_libsgx_dcap_default_qpl
-deb_libsgx_dcap_default_qpl: 
-	$(MAKE) -C external/dcap_source/QuoteGeneration deb_sgx_dcap_default_qpl_pkg
-	$(CP) external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-dcap-default-qpl/libsgx-dcap-default-qpl*deb ./linux/installer/deb/sgx-aesm-service/
-
-.PHONY: deb_libsgx_dcap_pccs
-deb_libsgx_dcap_pccs: 
-	$(MAKE) -C external/dcap_source/QuoteGeneration deb_sgx_dcap_pccs_pkg
-	$(CP) external/dcap_source/QuoteGeneration/installer/linux/deb/sgx-dcap-pccs/sgx-dcap-pccs*deb ./linux/installer/deb/sgx-aesm-service/
-
 .PHONY: deb_sgx_aesm_service
 deb_sgx_aesm_service: psw
 	./linux/installer/deb/sgx-aesm-service/build.sh
@@ -144,8 +142,36 @@ deb_libsgx_enclave_common: psw
 deb_libsgx_urts: psw
 	./linux/installer/deb/libsgx-urts/build.sh
 
+ifeq ($(CC_BELOW_5_2), 1)
 .PHONY: deb_psw_pkg
-deb_psw_pkg: deb_libsgx_qe3_logic deb_libsgx_pce_logic deb_sgx_aesm_service deb_libsgx_epid deb_libsgx_launch deb_libsgx_quote_ex deb_libsgx_uae_service deb_libsgx_enclave_common deb_libsgx_urts deb_libsgx_ae_qe3 deb_libsgx_dcap_default_qpl deb_libsgx_dcap_pccs
+deb_psw_pkg: deb_libsgx_qe3_logic deb_libsgx_pce_logic deb_sgx_aesm_service deb_libsgx_epid deb_libsgx_launch deb_libsgx_quote_ex deb_libsgx_uae_service deb_libsgx_enclave_common deb_libsgx_urts deb_libsgx_ae_qe3
+else
+.PHONY: deb_libsgx_dcap_default_qpl
+deb_libsgx_dcap_default_qpl:
+	$(MAKE) -C external/dcap_source/QuoteGeneration deb_sgx_dcap_default_qpl_pkg
+	$(CP) external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-dcap-default-qpl/libsgx-dcap-default-qpl*deb ./linux/installer/deb/sgx-aesm-service/
+
+.PHONY: deb_libsgx_dcap_pccs
+deb_libsgx_dcap_pccs:
+	$(MAKE) -C external/dcap_source/QuoteGeneration deb_sgx_dcap_pccs_pkg
+	$(CP) external/dcap_source/QuoteGeneration/installer/linux/deb/sgx-dcap-pccs/sgx-dcap-pccs*deb ./linux/installer/deb/sgx-aesm-service/
+
+.PHONY: deb_libsgx_dcap_ql
+deb_libsgx_dcap_ql:
+	$(MAKE) -C external/dcap_source/QuoteGeneration deb_sgx_dcap_ql_pkg
+	$(CP) external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-dcap-ql/libsgx-dcap-ql*deb ./linux/installer/deb/sgx-aesm-service/
+
+.PHONY: deb_libsgx_ae_qve
+deb_libsgx_ae_qve:
+ifeq ("$(wildcard ./external/dcap_source/QuoteGeneration/psw/ae/data/prebuilt/libsgx_qve.signed.so)", "")
+	./external/dcap_source/QuoteGeneration/download_prebuilt.sh
+endif
+	$(MAKE) -C external/dcap_source/QuoteGeneration deb_sgx_ae_qve_pkg
+	$(CP) external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-ae-qve/libsgx-ae-qve*deb ./linux/installer/deb/sgx-aesm-service/
+
+.PHONY: deb_psw_pkg
+deb_psw_pkg: deb_libsgx_qe3_logic deb_libsgx_pce_logic deb_sgx_aesm_service deb_libsgx_epid deb_libsgx_launch deb_libsgx_quote_ex deb_libsgx_uae_service deb_libsgx_enclave_common deb_libsgx_urts deb_libsgx_ae_qe3 deb_libsgx_dcap_default_qpl deb_libsgx_dcap_pccs deb_libsgx_dcap_ql deb_libsgx_ae_qve
+endif
 
 .PHONY: deb_local_repo
 deb_local_repo: deb_psw_pkg
@@ -199,18 +225,49 @@ rpm_libsgx_urts: psw
 rpm_sdk_pkg: sdk
 	./linux/installer/rpm/sdk/build.sh
 
+ifeq ($(CC_BELOW_5_2), 1)
 .PHONY: rpm_psw_pkg
 rpm_psw_pkg: rpm_libsgx_pce_logic rpm_libsgx_qe3_logic rpm_sgx_aesm_service rpm_libsgx_epid rpm_libsgx_launch rpm_libsgx_quote_ex rpm_libsgx_uae_service rpm_libsgx_enclave_common rpm_libsgx_urts rpm_libsgx_ae_qe3
+else
+.PHONY: rpm_libsgx_dcap_default_qpl
+rpm_libsgx_dcap_default_qpl:
+	$(MAKE) -C external/dcap_source/QuoteGeneration rpm_sgx_dcap_default_qpl_pkg
+	$(CP) external/dcap_source/QuoteGeneration/installer/linux/rpm/libsgx-dcap-default-qpl/libsgx-dcap-default-qpl*.rpm ./linux/installer/rpm/sgx-aesm-service/
+
+.PHONY: rpm_libsgx_dcap_pccs
+rpm_libsgx_dcap_pccs:
+	$(MAKE) -C external/dcap_source/QuoteGeneration rpm_sgx_dcap_pccs_pkg
+	$(CP) external/dcap_source/QuoteGeneration/installer/linux/rpm/sgx-dcap-pccs/sgx-dcap-pccs*.rpm ./linux/installer/rpm/sgx-aesm-service/
+
+.PHONY: rpm_libsgx_dcap_ql
+rpm_libsgx_dcap_ql:
+	$(MAKE) -C external/dcap_source/QuoteGeneration rpm_sgx_dcap_ql_pkg
+	$(CP) external/dcap_source/QuoteGeneration/installer/linux/rpm/libsgx-dcap-ql/libsgx-dcap-ql*rpm ./linux/installer/rpm/sgx-aesm-service/
+
+.PHONY: rpm_libsgx_ae_qve
+rpm_libsgx_ae_qve:
+ifeq ("$(wildcard ./external/dcap_source/QuoteGeneration/psw/ae/data/prebuilt/libsgx_qve.signed.so)", "")
+	./external/dcap_source/QuoteGeneration/download_prebuilt.sh
+endif
+	$(MAKE) -C external/dcap_source/QuoteGeneration rpm_sgx_ae_qve_pkg
+	$(CP) external/dcap_source/QuoteGeneration/installer/linux/rpm/libsgx-ae-qve/libsgx-ae-qve*rpm ./linux/installer/rpm/sgx-aesm-service/
+
+.PHONY: rpm_psw_pkg
+rpm_psw_pkg: rpm_libsgx_pce_logic rpm_libsgx_qe3_logic rpm_sgx_aesm_service rpm_libsgx_epid rpm_libsgx_launch rpm_libsgx_quote_ex rpm_libsgx_uae_service rpm_libsgx_enclave_common rpm_libsgx_urts rpm_libsgx_ae_qe3 rpm_libsgx_dcap_default_qpl rpm_libsgx_dcap_pccs rpm_libsgx_dcap_ql rpm_libsgx_ae_qve
+endif
 
 .PHONY: rpm_local_repo
 rpm_local_repo: rpm_psw_pkg
 	./linux/installer/common/local_repo_builder/local_repo_builder.sh rpm build
 
 clean:
-	@$(MAKE) -C sdk/                                clean
-	@$(MAKE) -C psw/                                clean
+	@$(MAKE) -C sdk/                                    clean
+	@$(MAKE) -C psw/                                    clean
 	@$(RM)   -r $(ROOT_DIR)/build
+	@$(RM)   -r linux/installer/bin/install-sgx-*.bin*.withLicense
 	@$(RM)   -r linux/installer/bin/sgx_linux*.bin
+	@$(RM)   -f ./linux/installer/deb/sgx-aesm-service/sgx-dcap-pccs*deb
+	@$(RM)   -f ./linux/installer/rpm/sgx-aesm-service/sgx-dcap-pccs*rpm
 	./linux/installer/deb/sgx-aesm-service/clean.sh
 	./linux/installer/deb/libsgx-epid/clean.sh
 	./linux/installer/deb/libsgx-launch/clean.sh
@@ -228,6 +285,29 @@ clean:
 	./linux/installer/rpm/libsgx-urts/clean.sh
 	./linux/installer/rpm/sdk/clean.sh
 	./linux/installer/common/local_repo_builder/local_repo_builder.sh rpm clean
+ifeq ("$(shell test -f external/dcap_source/QuoteVerification/dcap_tvl/Makefile && echo TVL Makefile exists)", "TVL Makefile exists")
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl MITIGATION-CVE-2020-0551=LOAD clean
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl MITIGATION-CVE-2020-0551=CF clean
+	$(MAKE) -C external/dcap_source/QuoteVerification/dcap_tvl clean
+endif
+ifeq ("$(shell test -f external/dcap_source/QuoteVerification/Makefile && echo Makefile exists)", "Makefile exists")
+	@$(MAKE) -C external/dcap_source/QuoteVerification  clean
+	@$(MAKE) -C external/dcap_source/QuoteGeneration    clean
+	./external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-ae-qve/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-ae-qe3/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-dcap-default-qpl/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-dcap-ql/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-pce-logic/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/deb/libsgx-qe3-logic/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/deb/sgx-dcap-pccs/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/rpm/libsgx-ae-qve/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/rpm/libsgx-ae-qe3/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/rpm/libsgx-dcap-default-qpl/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/rpm/libsgx-dcap-ql/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/rpm/libsgx-pce-logic/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/rpm/libsgx-qe3-logic/clean.sh
+	./external/dcap_source/QuoteGeneration/installer/linux/rpm/sgx-dcap-pccs/clean.sh
+endif
 
 rebuild:
 	$(MAKE) clean