Merge pull request #299 from lzha101/create_enclave_ex

Add 'const' to sgx_create_enclave_ex()

Signed-off-by: Zhang Lili Z [email protected]

Author: lzha101

SampleCode/Switchless/App/App.cpp

@@ -199,7 +199,7 @@ int initialize_enclave(const sgx_uswitchless_config_t* us_config)
     /* Step 2: call sgx_create_enclave to initialize an enclave instance */
     /* Debug Support: set 2nd parameter to 1 */
 
-    void* enclave_ex_p[32] = { 0 };
+    const void* enclave_ex_p[32] = { 0 };
 
     enclave_ex_p[SGX_CREATE_ENCLAVE_EX_SWITCHLESS_BIT_IDX] = (void*)us_config;
 

common/inc/sgx_urts.h

@@ -82,7 +82,7 @@ sgx_status_t SGXAPI sgx_create_enclave_ex(const char * file_name,
                                           sgx_enclave_id_t * enclave_id, 
                                           sgx_misc_attribute_t * misc_attr,  
                                           const uint32_t ex_features, 
-                                          void* ex_features_p[32]);
+                                          const void* ex_features_p[32]);
 
 
 sgx_status_t SGXAPI sgx_create_encrypted_enclave(

psw/urts/linux/urts.cpp

@@ -40,7 +40,7 @@
 
 #include "urts_com.h"
 
-static bool inline _check_ex_params_(const uint32_t ex_features, void* ex_features_p[32])
+static bool inline _check_ex_params_(const uint32_t ex_features, const void* ex_features_p[32])
 {
     //update last feature index if it fails here
     se_static_assert(_SGX_LAST_EX_FEATURE_IDX_ == SGX_CREATE_ENCLAVE_EX_SWITCHLESS_BIT_IDX);
@@ -64,7 +64,7 @@ extern "C" sgx_status_t __sgx_create_enclave_ex(const char *file_name,
                                                 sgx_enclave_id_t *enclave_id, 
                                                 sgx_misc_attribute_t *misc_attr,
                                                 const uint32_t ex_features,
-                                                void* ex_features_p[32])
+                                                const void* ex_features_p[32])
 {
     sgx_status_t ret = SGX_SUCCESS;
 
@@ -120,7 +120,7 @@ extern "C"  sgx_status_t sgx_create_enclave_ex(const char *file_name,
                                                sgx_enclave_id_t *enclave_id,
                                                sgx_misc_attribute_t *misc_attr,
                                                const uint32_t ex_features,
-                                               void* ex_features_p[32])
+                                               const void* ex_features_p[32])
 {
 
     return __sgx_create_enclave_ex(file_name, debug, launch_token,
@@ -139,7 +139,7 @@ sgx_create_encrypted_enclave(
     uint8_t* sealed_key)
 {
     uint32_t ex_features = SGX_CREATE_ENCLAVE_EX_PCL;
-    void* ex_features_p[32] = { 0 };
+    const void* ex_features_p[32] = { 0 };
     ex_features_p[SGX_CREATE_ENCLAVE_EX_PCL_BIT_IDX] = (void*)sealed_key;
 
     return __sgx_create_enclave_ex(file_name, debug, launch_token,

psw/urts/urts_com.h

@@ -193,7 +193,7 @@ static int __create_enclave(BinParser &parser,
                             sgx_enclave_id_t *enclave_id, 
                             sgx_misc_attribute_t *misc_attr,
                             const uint32_t ex_features,
-                            void* ex_features_p[32])
+                            const void* ex_features_p[32])
 {
     // The "parser" will be registered into "loader" and "loader" will be registered into "enclave".
     // After enclave is created, "parser" and "loader" are not needed any more.
@@ -425,7 +425,7 @@ static int __create_enclave(BinParser &parser,
 
 sgx_status_t _create_enclave_ex(const bool debug, se_file_handle_t pfile, se_file_t& file, le_prd_css_file_t *prd_css_file, 
 	                            sgx_launch_token_t *launch, int *launch_updated, sgx_enclave_id_t *enclave_id, 
-                                sgx_misc_attribute_t *misc_attr, const uint32_t ex_features, void* ex_features_p[32])
+                                sgx_misc_attribute_t *misc_attr, const uint32_t ex_features, const void* ex_features_p[32])
 {
     unsigned int ret = SGX_SUCCESS;
     sgx_status_t lt_result = SGX_SUCCESS;