test

Signed-off-by: Bruno Vavala <bruno.vavala@intel.com>
bvavala · Nov 5, 2024 · 32cec7b · 32cec7b
1 parent a4ad7dd
commit 32cec7b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/build/common-config.sh b/build/common-config.sh
@@ -34,6 +34,12 @@ var_set() {
 	"
 	env_key_sort[$i]="WASM_SRC"; i=$i+1; export WASM_SRC=${env_val[WASM_SRC]};
 
+	env_val[DCAP_PRIMITIVES]="${DCAP_PRIMITIVES:-/tmp/SGXDataCenterAttestationPrimitives}"
+	env_desc[DCAP_PRIMITIVES]="
+	    DCAP_PRIMITIVES points to the source repo of DCAP
+	"
+	env_key_sort[$i]="DCAP_PRIMITIVES"; i=$i+1; export DCAP_PRIMITIVES=${env_val[DCAP_PRIMITIVES]};
+
 	env_val[PDO_MEMORY_CONFIG]="${PDO_MEMORY_CONFIG:-MEDIUM}"
 	env_desc[PDO_MEMORY_CONFIG]="
 		PDO_MEMORY_CONFIG indicates the memory configuration for the

diff --git a/common/crypto/attestation-api/CMakeLists.txt b/common/crypto/attestation-api/CMakeLists.txt
@@ -12,6 +12,10 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 INCLUDE(CMakeVariables.txt)
 
+IF (NOT DEFINED ENV{DCAP_PRIMITIVES})
+  MESSAGE(FATAL_ERROR "DCAP_PRIMITIVES variable with source repo path not defined")
+ENDIF()
+
 ###################################################################################################
 # First run cmake in common
 ###################################################################################################

diff --git a/docker/pdo_services_base.dockerfile b/docker/pdo_services_base.dockerfile
@@ -88,9 +88,9 @@ ENV SGX_SSL="/opt/intel/sgxssl"
 # Install dependencies for Attestation API
 # -----------------------------------------------------------------
 
-ENV DCAP_PRIMITIVES=/tmp/SGXDataCenterAttestationPrimitives
+# as the pdo repo is not available at this point, we copy the script in the container
 COPY repository/common/crypto/attestation-api/docker/container/setup.sh /tmp
-RUN /tmp/setup.sh
+RUN DCAP_PRIMITIVES=/tmp/SGXDataCenterAttestationPrimitives /tmp/setup.sh
 RUN rm /tmp/setup.sh
 
 # -----------------------------------------------------------------

diff --git a/docker/tools/environment.sh b/docker/tools/environment.sh
@@ -35,6 +35,7 @@ export PDO_HOME=${PDO_INSTALL_ROOT}/opt/pdo
 export PDO_LEDGER_KEY_ROOT=${PDO_HOME}/keys/ledger
 export PDO_LEDGER_KEY_SKF=${PDO_LEDGER_KEY_ROOT}/pdo_validator.priv
 export WASM_SRC="${PDO_SOURCE_ROOT}/interpreters/wasm-micro-runtime"
+export DCAP_PRIMITIVES=${DCAP_PRIMITIVES:-/tmp/SGXDataCenterAttestationPrimitives}
 
 if [ ${PDO_LEDGER_TYPE,,} = "ccf" ]; then
     export PDO_DEFAULT_SIGCURVE=SECP384R1