Remove SGX uRTS dependency in quote verification library (#193)

* Remove sgx_urts dependency in QVL

Signed-off-by: HongyanJiang <hongyan.jiang@intel.com>

Author: hyjiang

QuoteVerification/dcap_quoteverify/inc/sgx_urts_wrapper.h

@@ -78,6 +78,14 @@ typedef sgx_status_t (SGXAPI *sgx_create_enclave_func_t)(const char* file_name,
     sgx_enclave_id_t* enclave_id,
     sgx_misc_attribute_t* misc_attr);
 
+#define SGX_URTS_API_OCALL_PTHREAD_CREATE "pthread_create_ocall"
+#define SGX_URTS_API_OCALL_PTHREAD_TIMEOUT "pthread_wait_timeout_ocall"
+#define SGX_URTS_API_OCALL_PTHREAD_WAKEUP "pthread_wakeup_ocall"
+
+typedef int (*pthread_create_ocall_func_t)(unsigned long long self);
+typedef int (*pthread_wait_timeout_ocall_func_t)(unsigned long long waiter, unsigned long long timeout);
+typedef int (*pthread_wakeup_ocall_func_t)(unsigned long long waiter);
+
 #endif
 
 #define SGX_URTS_API_DESTROY_ENCLAVE "sgx_destroy_enclave"
@@ -89,10 +97,9 @@ typedef sgx_status_t (SGXAPI *sgx_create_enclave_func_t)(const char* file_name,
 #define SGX_URTS_API_OCALL_SET_MULTIPLE_EVENT "sgx_thread_set_multiple_untrusted_events_ocall"
 
 
-
 typedef sgx_status_t (SGXAPI* sgx_destroy_enclave_func_t)(const sgx_enclave_id_t enclave_id);
 
-typedef sgx_status_t(SGXAPI* sgx_ecall_func_t)(const sgx_enclave_id_t eid, const int index, const void* ocall_table, void* ms);
+typedef sgx_status_t (SGXAPI* sgx_ecall_func_t)(const sgx_enclave_id_t eid, const int index, const void* ocall_table, void* ms);
 
 typedef void (*sgx_oc_cpuidex_func_t)(int cpuinfo[4], int leaf, int subleaf);
 
@@ -114,4 +121,3 @@ bool sgx_dcap_load_urts();
 
 #endif /* !_SGX_URTS_WRAPPER_H_*/
 
-

QuoteVerification/dcap_quoteverify/linux/config.cpp

@@ -72,7 +72,9 @@ extern sgx_thread_wait_untrusted_event_ocall_func_t p_sgx_thread_wait_untrusted_
 extern sgx_thread_set_untrusted_event_ocall_func_t p_sgx_thread_set_untrusted_event_ocall;
 extern sgx_thread_setwait_untrusted_events_ocall_func_t p_sgx_thread_setwait_untrusted_events_ocall;
 extern sgx_thread_set_multiple_untrusted_events_ocall_func_t p_sgx_thread_set_multiple_untrusted_events_ocall;
-
+extern pthread_create_ocall_func_t p_pthread_create_ocall;
+extern pthread_wait_timeout_ocall_func_t p_pthread_wait_timeout_ocall;
+extern pthread_wakeup_ocall_func_t p_pthread_wakeup_ocall_func;
 
 
 #ifndef MAX_PATH
@@ -252,7 +254,7 @@ bool sgx_dcap_load_urts()
 
             if (g_urts_handle == NULL) {
                 fputs(dlerror(), stderr);
-                SE_TRACE(SE_TRACE_ERROR, "Couldn't find urts library: %s\n", SGX_URTS_LIB_FILE_NAME);
+                SE_TRACE(SE_TRACE_DEBUG, "Couldn't find urts library: %s\n", SGX_URTS_LIB_FILE_NAME);
                 break;
             }
 
@@ -329,6 +331,32 @@ bool sgx_dcap_load_urts()
                 break;
             }
 
+            //search for pthread_create_ocall symbol in urts library
+            //
+            p_pthread_create_ocall = (pthread_create_ocall_func_t)dlsym(g_urts_handle, SGX_URTS_API_OCALL_PTHREAD_CREATE);
+            err = dlerror();
+            if (p_pthread_create_ocall == NULL || err != NULL) {
+                SE_TRACE(SE_TRACE_ERROR, "Couldn't locate %s in urts library %s.\n", SGX_URTS_API_OCALL_PTHREAD_CREATE, SGX_URTS_LIB_FILE_NAME);
+                break;
+            }
+
+            //search for pthread_wait_timeout_ocall symbol in urts library
+            //
+            p_pthread_wait_timeout_ocall = (pthread_wait_timeout_ocall_func_t)dlsym(g_urts_handle, SGX_URTS_API_OCALL_PTHREAD_TIMEOUT);
+            err = dlerror();
+            if (p_pthread_wait_timeout_ocall == NULL || err != NULL) {
+                SE_TRACE(SE_TRACE_ERROR, "Couldn't locate %s in urts library %s.\n", SGX_URTS_API_OCALL_PTHREAD_TIMEOUT, SGX_URTS_LIB_FILE_NAME);
+                break;
+            }
+
+            //search for pthread_wakeup_ocall symbol in urts library
+            //
+            p_pthread_wakeup_ocall_func = (pthread_wakeup_ocall_func_t)dlsym(g_urts_handle, SGX_URTS_API_OCALL_PTHREAD_WAKEUP);
+            err = dlerror();
+            if (p_pthread_wakeup_ocall_func == NULL || err != NULL) {
+                SE_TRACE(SE_TRACE_ERROR, "Couldn't locate %s in urts library %s.\n", SGX_URTS_API_OCALL_PTHREAD_WAKEUP, SGX_URTS_LIB_FILE_NAME);
+                break;
+            }
 
             ret = true;
 
@@ -435,6 +463,15 @@ __attribute__((destructor)) void _qv_global_destructor()
     if (p_sgx_thread_set_multiple_untrusted_events_ocall)
         p_sgx_thread_set_multiple_untrusted_events_ocall = NULL;
 
+    if (p_pthread_create_ocall)
+        p_pthread_create_ocall = NULL;
+
+    if (p_pthread_wait_timeout_ocall)
+        p_pthread_wait_timeout_ocall = NULL;
+
+    if (p_pthread_wakeup_ocall_func)
+        p_pthread_wakeup_ocall_func = NULL;
+
     if (g_urts_handle) {
         dlclose(g_urts_handle);
         g_urts_handle = NULL;

QuoteVerification/dcap_quoteverify/sgx_dcap_quoteverify.cpp

@@ -38,19 +38,24 @@
 #include "sgx_dcap_pcs_com.h"
 #include "sgx_dcap_qv_internal.h"
 #include "sgx_qve_def.h"
-#ifndef _MSC_VER
-#include "linux/qve_u.h"
-#else //_MSC_VER
-#include "win/qve_u.h"
-#endif //_MSC_VER
 #include <stdlib.h>
 #include <stdio.h>
-#include <sgx_urts.h>
 #include "se_trace.h"
 #include "se_thread.h"
 #include "se_memcpy.h"
 #include "sgx_urts_wrapper.h"
 
+#if defined(_MSC_VER)
+#include <tchar.h>
+#include "win/qve_u.h"
+bool get_qve_path(TCHAR *p_file_path, size_t buf_size);
+#else
+#include <limits.h>
+#include "linux/qve_u.h"
+#define MAX_PATH PATH_MAX
+bool get_qve_path(char *p_file_path, size_t buf_size);
+#endif
+
 
 sgx_create_enclave_func_t p_sgx_urts_create_enclave = NULL;
 sgx_destroy_enclave_func_t p_sgx_urts_destroy_enclave = NULL;
@@ -122,14 +127,38 @@ int sgx_thread_set_multiple_untrusted_events_ocall(const void **waiters, size_t
 }
 
 
-#if defined(_MSC_VER)
-#include <tchar.h>
-bool get_qve_path(TCHAR *p_file_path, size_t buf_size);
-#else
-#include <limits.h>
-#define MAX_PATH PATH_MAX
-bool get_qve_path(char *p_file_path, size_t buf_size);
+#ifdef __GNUC__
 
+pthread_create_ocall_func_t p_pthread_create_ocall = NULL;
+pthread_wait_timeout_ocall_func_t p_pthread_wait_timeout_ocall = NULL;
+pthread_wakeup_ocall_func_t p_pthread_wakeup_ocall_func = NULL;
+
+int pthread_create_ocall(unsigned long long self)
+{
+    if (!sgx_dcap_load_urts()) {
+        return SGX_ERROR_UNEXPECTED;
+    }
+
+    return p_pthread_create_ocall(self);
+}
+
+int pthread_wait_timeout_ocall(unsigned long long waiter, unsigned long long timeout)
+{
+    if (!sgx_dcap_load_urts()) {
+        return SGX_ERROR_UNEXPECTED;
+    }
+
+    return p_pthread_wait_timeout_ocall(waiter, timeout);
+}
+
+int pthread_wakeup_ocall(unsigned long long waiter)
+{
+    if (!sgx_dcap_load_urts()) {
+        return SGX_ERROR_UNEXPECTED;
+    }
+
+    return p_pthread_wakeup_ocall_func(waiter);
+}
 #endif
 
 struct QvE_status {