Browse Source

Merge pull request #253 from yuyuany/refle

fix ref_le build issue with edger8r
Andy Zhao 6 years ago
parent
commit
4b31cebfe5
2 changed files with 3 additions and 3 deletions
  1. 2 2
      psw/ae/ref_le/ref_le.cpp
  2. 1 1
      psw/ae/ref_le/ref_le.edl

+ 2 - 2
psw/ae/ref_le/ref_le.cpp

@@ -57,7 +57,7 @@ static void copy_reversed_byte_array(uint8_t *dst, const uint8_t *src, size_t si
 }
 
 // calculate the white list expected size based on entry count
-size_t ref_le_get_white_list_size(const ref_le_white_list_t* val)
+static size_t ref_le_get_white_list_size(const ref_le_white_list_t* val)
 {
     if (val == NULL) {
         return 0;
@@ -79,7 +79,7 @@ int ref_le_init_white_list(const ref_le_white_list_t* p_ref_le_white_list, uint3
 {
     sgx_status_t sgx_stat = SGX_SUCCESS;
 
-    if (p_ref_le_white_list == NULL || p_ref_le_white_list_signature == NULL)
+    if (p_ref_le_white_list == NULL || ref_le_white_list_size < (uint32_t)sizeof(ref_le_white_list_t) || p_ref_le_white_list_signature == NULL)
     {
         return LE_INVALID_PARAMETER;
     }

+ 1 - 1
psw/ae/ref_le/ref_le.edl

@@ -45,7 +45,7 @@ enclave {
         );
 
         public int ref_le_init_white_list(
-            [in, sizefunc = ref_le_get_white_list_size]  const ref_le_white_list_t  *p_ref_le_white_list,
+            [in, size = ref_le_white_list_size]  const ref_le_white_list_t  *p_ref_le_white_list,
             uint32_t ref_le_white_list_size,
             [in]  const sgx_rsa3072_signature_t  *p_ref_le_white_list_signature
         );