simplify dcap installation, switching completely to 1.22

Signed-off-by: Bruno Vavala <[email protected]>

common/crypto/attestation-api/CMakeLists.txt

@@ -12,10 +12,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 INCLUDE(CMakeVariables.txt)
 
-# get the tag of the dcap primitives (necessary to manage library links)
-EXECUTE_PROCESS(COMMAND bash -c "cd $ENV{DCAP_PRIMITIVES} && git describe --tags" OUTPUT_VARIABLE DCAP_PRIMITIVES_TAG)
-STRING(STRIP ${DCAP_PRIMITIVES_TAG} DCAP_PRIMITIVES_TAG)
-
 ###################################################################################################
 # First run cmake in common
 ###################################################################################################
@@ -99,9 +95,7 @@ ADD_CUSTOM_COMMAND(TARGET ${B64ATTESTATION_TO_B64COLLATERAL}
 
 TARGET_INCLUDE_DIRECTORIES(${B64ATTESTATION_TO_B64COLLATERAL} PRIVATE common)
 
-IF("${DCAP_PRIMITIVES_TAG}" STREQUAL "DCAP_1.22")
-    SET(DCAP_LINK_LIBS ${DCAP_QV_PATH}/appraisal/qal/libdcap_qal.a)
-ENDIF()
+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

docker/pdo_services_base.dockerfile

@@ -106,7 +106,7 @@ RUN apt-get install -y \
         libsgx-dcap-default-qpl-dev \
         jq
 
-ARG DCAP=1.19
+ARG DCAP=1.22
 ENV DCAP_PRIMITIVES=/tmp/SGXDataCenterAttestationPrimitives
 
 RUN git clone https://github.com/intel/SGXDataCenterAttestationPrimitives.git ${DCAP_PRIMITIVES} \
@@ -146,7 +146,4 @@ RUN useradd -m -u $UID -g $GID -d /project/pdo -o -s /bin/bash $UNAME
 RUN chown --recursive $UNAME:$UNAME /project/pdo
 USER $UNAME
 
-#this is necessary for git operations such as "git describe --tags" from the new user
-RUN git config --global --add safe.directory ${DCAP_PRIMITIVES}
-
 ENTRYPOINT ["/bin/bash"]