test

Signed-off-by: Bruno Vavala <[email protected]>
bvavala · Nov 5, 2024 · e2e4311 · e2e4311
1 parent dc29d39
commit e2e4311
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/common/crypto/attestation-api/CMakeLists.txt b/common/crypto/attestation-api/CMakeLists.txt
@@ -95,8 +95,8 @@ ADD_CUSTOM_COMMAND(TARGET ${B64ATTESTATION_TO_B64COLLATERAL}
 
 TARGET_INCLUDE_DIRECTORIES(${B64ATTESTATION_TO_B64COLLATERAL} PRIVATE common)
 
-# newer DCAP libs need the qal
-#SET(DCAP_LINK_LIBS ${DCAP_QV_PATH}/appraisal/qal/libdcap_qal.a)
+# newer DCAP (1.22) libs need the qal (older, 1.19, don't)
+SET(DCAP_LINK_LIBS ${DCAP_QV_PATH}/appraisal/qal/libdcap_qal.a)
 
 TARGET_LINK_LIBRARIES(${B64ATTESTATION_TO_B64COLLATERAL}
     #${DCAP_QV_PATH}/dcap_quoteverify/linux/libsgx_dcap_quoteverify.a

diff --git a/common/crypto/attestation-api/docker/container/setup.sh b/common/crypto/attestation-api/docker/container/setup.sh
@@ -44,8 +44,7 @@ apt-get install -y \
     libsgx-dcap-default-qpl-dev \
     jq
 
-export DCAP=1.19
-export DCAP_PRIMITIVES=/tmp/SGXDataCenterAttestationPrimitives
+export DCAP=1.22
 
 git clone https://github.com/intel/SGXDataCenterAttestationPrimitives.git ${DCAP_PRIMITIVES} \
     && cd ${DCAP_PRIMITIVES}/QuoteVerification \

diff --git a/docker/pdo_services_base.dockerfile b/docker/pdo_services_base.dockerfile
@@ -88,6 +88,7 @@ ENV SGX_SSL="/opt/intel/sgxssl"
 # Install dependencies for Attestation API
 # -----------------------------------------------------------------
 
+ENV DCAP_PRIMITIVES=/tmp/SGXDataCenterAttestationPrimitives
 COPY repository/common/crypto/attestation-api/docker/container/setup.sh /tmp
 RUN /tmp/setup.sh
 RUN rm /tmp/setup.sh