This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
The following commit(s) were added to refs/heads/develop by this push:
new 61f41db [protected_fs_rs] Make protected_fs compatible with sgx 2.8.
(#218)
61f41db is described below
commit 61f41db4a6fd34c407cdf7522339c2520093b5cf
Author: Rundong Zhou <[email protected]>
AuthorDate: Wed Feb 5 15:14:17 2020 -0800
[protected_fs_rs] Make protected_fs compatible with sgx 2.8. (#218)
This patch is backward-compatible. To work under sgx 2.8, struct
global_data_t needs to be patched for crates-io & crates-sgx.
---
common/protected_fs_rs/protected_fs_c/inc/non_sgx_protected_fs.h | 9 ---------
.../protected_fs_c/sgx_tprotected_fs/protected_fs_nodes.h | 5 ++++-
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/common/protected_fs_rs/protected_fs_c/inc/non_sgx_protected_fs.h
b/common/protected_fs_rs/protected_fs_c/inc/non_sgx_protected_fs.h
index e8b8ca0..2350a88 100644
--- a/common/protected_fs_rs/protected_fs_c/inc/non_sgx_protected_fs.h
+++ b/common/protected_fs_rs/protected_fs_c/inc/non_sgx_protected_fs.h
@@ -47,15 +47,6 @@ typedef struct _sgx_cpu_svn_t
uint8_t svn[SGX_CPUSVN_SIZE];
} sgx_cpu_svn_t;
-// defined in sgx_tae_service.h
-#define SGX_MC_UUID_COUNTER_ID_SIZE 3
-#define SGX_MC_UUID_NONCE_SIZE 13
-typedef struct _mc_uuid {
- uint8_t counter_id[SGX_MC_UUID_COUNTER_ID_SIZE];
- uint8_t nonce[SGX_MC_UUID_NONCE_SIZE];
-} sgx_mc_uuid_t;
-
-
// sgx_attributes.h
typedef struct _attributes_t
{
diff --git
a/common/protected_fs_rs/protected_fs_c/sgx_tprotected_fs/protected_fs_nodes.h
b/common/protected_fs_rs/protected_fs_c/sgx_tprotected_fs/protected_fs_nodes.h
index 581d2b8..9407ba2 100644
---
a/common/protected_fs_rs/protected_fs_c/sgx_tprotected_fs/protected_fs_nodes.h
+++
b/common/protected_fs_rs/protected_fs_c/sgx_tprotected_fs/protected_fs_nodes.h
@@ -28,7 +28,6 @@
#else
#include <sgx_report.h>
#include <sgx_tcrypto.h>
-#include <sgx_tae_service.h>
#endif
#pragma pack(push, 1)
@@ -68,6 +67,10 @@ typedef struct _meta_data_plain
#define MD_USER_DATA_SIZE (NODE_SIZE*3/4) // 3072
COMPILE_TIME_ASSERT(md_user_data_size, MD_USER_DATA_SIZE == 3072);
+typedef struct _mc_uuid {
+ uint8_t mc_uuid[16];
+} sgx_mc_uuid_t;
+
typedef struct _meta_data_encrypted
{
char clean_filename[FILENAME_MAX_LEN];
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
