fix ref_le build issue with edger8r

Yu Yuan · Yu Yuan · commit 2544dbd7291b · 2018-04-16T18:14:29.000+08:00
Signed-off-by: Yu Yuan &lt;yuan.yu@intel.com&gt;
diff --git a/psw/ae/ref_le/ref_le.cpp b/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;
     }
diff --git a/psw/ae/ref_le/ref_le.edl b/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
         );

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ static void copy_reversed_byte_array(uint8_t dst, const uint8_t src, size_t si`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// calculate the white list expected size based on entry count`
`60`		`-size_t ref_le_get_white_list_size(const ref_le_white_list_t* val)`
	`60`	`+static size_t ref_le_get_white_list_size(const ref_le_white_list_t* val)`
`61`	`61`	`{`
`62`	`62`	`if (val == NULL) {`
`63`	`63`	`return 0;`
`@@ -79,7 +79,7 @@ int ref_le_init_white_list(const ref_le_white_list_t* p_ref_le_white_list, uint3`
`79`	`79`	`{`
`80`	`80`	`sgx_status_t sgx_stat = SGX_SUCCESS;`
`81`	`81`
`82`		`- if (p_ref_le_white_list == NULL \|\| p_ref_le_white_list_signature == NULL)`
	`82`	`+ 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)`
`83`	`83`	`{`
`84`	`84`	`return LE_INVALID_PARAMETER;`
`85`	`85`	`}`