From a7d8c070dc5bd01e45cd97c3d1cfc98544f165f8 Mon Sep 17 00:00:00 2001 From: Chia-Che Tsai Date: Tue, 3 Oct 2017 09:59:42 -0400 Subject: [PATCH] completely deprecate sgx.heap_min --- Pal/src/host/Linux-SGX/sgx_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Pal/src/host/Linux-SGX/sgx_main.c b/Pal/src/host/Linux-SGX/sgx_main.c index 6851390b..7170d973 100644 --- a/Pal/src/host/Linux-SGX/sgx_main.c +++ b/Pal/src/host/Linux-SGX/sgx_main.c @@ -278,10 +278,6 @@ int initialize_enclave (struct pal_enclave * enclave) goto err; } - /* Reading sgx.heap_min from manifest */ - if (get_config(enclave->config, "sgx.heap_min", cfgbuf, CONFIG_MAX) > 0) - heap_min = parse_int(cfgbuf); - /* Reading sgx.thread_num from manifest */ if (get_config(enclave->config, "sgx.thread_num", cfgbuf, CONFIG_MAX) > 0) enclave->thread_num = parse_int(cfgbuf); @@ -295,9 +291,9 @@ int initialize_enclave (struct pal_enclave * enclave) /* Reading sgx.static_address from manifest */ if (get_config(enclave->config, "sgx.static_address", cfgbuf, CONFIG_MAX) > 0 && cfgbuf[0] == '1') - enclave->baseaddr = DEAFULT_HEAP_MIN; + enclave->baseaddr = heap_min; else - enclave->baseaddr = 0; + enclave->baseaddr = heap_min = 0; TRY(read_enclave_token, enclave->token, &enclave_token); TRY(read_enclave_sigstruct, enclave->sigfile, &enclave_sigstruct);