From a0cd4942b8036e8e838361e62b58c4a2fcd45bb1 Mon Sep 17 00:00:00 2001 From: xiangyuT Date: Tue, 14 Mar 2023 14:15:25 +0800 Subject: [PATCH 1/2] Modify tdx device from tdx-attest to tdx-guest --- ppml/README.md | 4 ++-- ppml/src/main/cpp/tdx_quote_generation.cpp | 2 +- .../intel/analytics/bigdl/ppml/dcap/Loader.java | 14 ++++++++++++-- .../analytics/bigdl/ppml/dcap/AttestationTest.java | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ppml/README.md b/ppml/README.md index 64301b531..965390ec8 100644 --- a/ppml/README.md +++ b/ppml/README.md @@ -10,12 +10,12 @@ C++ SGX/TDX attestation module for PPML 1. [Install Intel SGX SDK](https://github.com/intel/linux-sgx#install-the-intelr-sgx-sdk) -2. Install SGX DCAP 1.14 libs +2. Install SGX DCAP 1.16 libs ```bash # Ubuntu 20.04, root cd /opt/intel -wget https://download.01.org/intel-sgx/sgx-dcap/1.14/linux/distro/ubuntu20.04-server/sgx_debian_local_repo.tgz +wget https://download.01.org/intel-sgx/sgx-dcap/1.16/linux/distro/ubuntu20.04-server/sgx_debian_local_repo.tgz tar xzf sgx_debian_local_repo.tgz echo 'deb [trusted=yes arch=amd64] file:///opt/intel/sgx_debian_local_repo focal main' | tee /etc/apt/sources.list.d/intel-sgx.list wget -qO - https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key | apt-key add - diff --git a/ppml/src/main/cpp/tdx_quote_generation.cpp b/ppml/src/main/cpp/tdx_quote_generation.cpp index 0f6bc68fd..ca9a62835 100644 --- a/ppml/src/main/cpp/tdx_quote_generation.cpp +++ b/ppml/src/main/cpp/tdx_quote_generation.cpp @@ -22,7 +22,7 @@ #include #include "tdx_attest.h" -#define devname "/dev/tdx-attest" +#define devname "/dev/tdx-guest" #define HEX_DUMP_SIZE 16 #define MAX_ROW_SIZE 70 diff --git a/ppml/src/main/java/com/intel/analytics/bigdl/ppml/dcap/Loader.java b/ppml/src/main/java/com/intel/analytics/bigdl/ppml/dcap/Loader.java index 0a9e9b098..d64470a34 100644 --- a/ppml/src/main/java/com/intel/analytics/bigdl/ppml/dcap/Loader.java +++ b/ppml/src/main/java/com/intel/analytics/bigdl/ppml/dcap/Loader.java @@ -38,12 +38,22 @@ public class Loader { public void init() throws IOException { // TODO: check SGX device to determine whether to load libquote_verification libraries.add("quote_verification"); + + File sgx_dev = new File("/dev/sgx/enclave"); + if (sgx_dev.exists()) { + + libraries.add("sgx_trts"); + libraries.add("sgx_tservice"); + + } else { + System.out.println("Not found /dev/sgx/enclave, disable SGX quote generation."); + } - File tdx_dev = new File("/dev/tdx-attest"); + File tdx_dev = new File("/dev/tdx-guest"); if (tdx_dev.exists()) { libraries.add("tdx_quote_generation"); } else { - System.out.println("Not found /dev/tdx-attest, disable TDX quote generation."); + System.out.println("Not found /dev/tdx-guest, disable TDX quote generation."); } Path tempDir = null; diff --git a/ppml/src/test/java/com/intel/analytics/bigdl/ppml/dcap/AttestationTest.java b/ppml/src/test/java/com/intel/analytics/bigdl/ppml/dcap/AttestationTest.java index f868e028a..32c643dfa 100644 --- a/ppml/src/test/java/com/intel/analytics/bigdl/ppml/dcap/AttestationTest.java +++ b/ppml/src/test/java/com/intel/analytics/bigdl/ppml/dcap/AttestationTest.java @@ -41,7 +41,7 @@ public void verifyBadQuote() throws Exception { @Test public void generateTDXQuote() throws Exception { - File tdx_dev = new File("/dev/tdx-attest"); + File tdx_dev = new File("/dev/tdx-guest"); if (tdx_dev.exists()) { Attestation tdx = new Attestation(); byte[] reportData = "ppmltest".getBytes(); From 89214b4d55d041a29e4cd22a105608a4943ffdc0 Mon Sep 17 00:00:00 2001 From: xiangyuT Date: Tue, 14 Mar 2023 14:16:46 +0800 Subject: [PATCH 2/2] Fix --- .../com/intel/analytics/bigdl/ppml/dcap/Loader.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ppml/src/main/java/com/intel/analytics/bigdl/ppml/dcap/Loader.java b/ppml/src/main/java/com/intel/analytics/bigdl/ppml/dcap/Loader.java index d64470a34..e2e5c3ba8 100644 --- a/ppml/src/main/java/com/intel/analytics/bigdl/ppml/dcap/Loader.java +++ b/ppml/src/main/java/com/intel/analytics/bigdl/ppml/dcap/Loader.java @@ -38,16 +38,6 @@ public class Loader { public void init() throws IOException { // TODO: check SGX device to determine whether to load libquote_verification libraries.add("quote_verification"); - - File sgx_dev = new File("/dev/sgx/enclave"); - if (sgx_dev.exists()) { - - libraries.add("sgx_trts"); - libraries.add("sgx_tservice"); - - } else { - System.out.println("Not found /dev/sgx/enclave, disable SGX quote generation."); - } File tdx_dev = new File("/dev/tdx-guest"); if (tdx_dev.exists()) {