Updates for SGX 2.17 reproducible build.

Signed-off-by: Zhang Lili <lili.z.zhang@intel.com>

SampleCode/SampleAttestedTLS/client/enc/openssl_client.cpp

@@ -118,7 +118,7 @@ int communicate_with_server(SSL* ssl)
                 SERVER_PAYLOAD_SIZE,
                 bytes_read);
             ret = bytes_read;
-            goto done;
+            break;
         }
         else
         {
@@ -128,7 +128,6 @@ int communicate_with_server(SSL* ssl)
             break;
         }
     } while (1);
-    ret = 0;
 done:
     return ret;
 }
@@ -137,12 +136,8 @@ done:
 int create_socket(char* server_name, char* server_port)
 {
     int sockfd = -1;
-    char* addr_ptr = nullptr;
-    int port = 0;
 	struct sockaddr_in dest_sock;
-    //struct addrinfo dest_info;//hints, *dest_info = nullptr, *curr_di = nullptr;
     int res = -1;
-	char *err_str = nullptr;
 
     sockfd = socket(AF_INET, SOCK_STREAM, 0);
     if (sockfd == -1)
@@ -151,14 +146,14 @@ int create_socket(char* server_name, char* server_port)
         goto done;
     }
 
-	dest_sock.sin_family = AF_INET;
-	dest_sock.sin_port = htons(atoi(server_port));
-	dest_sock.sin_addr.s_addr = inet_addr2(server_name);
-	bzero(&(dest_sock.sin_zero), sizeof(dest_sock.sin_zero));
+    dest_sock.sin_family = AF_INET;
+    dest_sock.sin_port = htons(atoi(server_port));
+    dest_sock.sin_addr.s_addr = inet_addr2(server_name);
+    bzero(&(dest_sock.sin_zero), sizeof(dest_sock.sin_zero));
     
-	if (connect(
-            sockfd, (sockaddr*) &dest_sock,
-            sizeof(struct sockaddr)) == -1)
+    if (connect(
+                sockfd, (sockaddr*) &dest_sock,
+                sizeof(struct sockaddr)) == -1)
     {
         t_print(
             TLS_CLIENT "failed to connect to %s:%s (errno=%d)\n",
@@ -166,8 +161,8 @@ int create_socket(char* server_name, char* server_port)
             server_port,
             errno);
         ocall_close(&res, sockfd);
-		if (res != 0) 
-			t_print(TLS_CLIENT "OCALL: error closing socket\n");
+        if (res != 0)
+            t_print(TLS_CLIENT "OCALL: error closing socket\n");
         sockfd = -1;
         goto done;
     }
@@ -266,13 +261,13 @@ int launch_tls_client(char* server_name, char* server_port)
 done:
 
     if (client_socket != -1) 
-	{
+    {
         ocall_close(&ret, client_socket);
-		if (ret != 0)
-			t_print(TLS_CLIENT "OCALL: error close socket\n");
-	}
+        if (ret != 0)
+            t_print(TLS_CLIENT "OCALL: error close socket\n");
+    }
 
-	if (ssl_session)
+    if (ssl_session)
     {
         SSL_shutdown(ssl_session);
         SSL_free(ssl_session);

SampleCode/SampleAttestedTLS/client/host/host.cpp

@@ -152,9 +152,9 @@ sgx_status_t initialize_enclave(const char *enclave_path)
 
     if (ret != SGX_SUCCESS)
     {
-		print_error_message(ret);
-		return ret;
-	}
+        print_error_message(ret);
+        return ret;
+    }
     return ret;
 }
 
@@ -166,14 +166,8 @@ void terminate_enclave()
 
 int main(int argc, const char* argv[])
 {
-    uint8_t* encrypted_msg = NULL;
-    size_t encrypted_msg_size = 0;
     sgx_status_t result = SGX_SUCCESS;
     int ret = 1;
-    uint8_t* pem_key = NULL;
-    size_t pem_key_size = 0;
-    uint8_t* remote_report = NULL;
-    size_t remote_report_size = 0;
     char* server_name = NULL;
     char* server_port = NULL;
 
@@ -229,7 +223,7 @@ int main(int argc, const char* argv[])
 
     printf("Host: launch TLS client to initiate TLS connection\n");
     result = launch_tls_client(client_global_eid, &ret, server_name, server_port);
-    if (ret != 0)
+    if (result != SGX_SUCCESS || ret != 0)
     {
         printf("Host: launch_tls_client failed\n");
         goto exit;
@@ -237,7 +231,7 @@ int main(int argc, const char* argv[])
     ret = 0;
 exit:
 
-	terminate_enclave();
+    terminate_enclave();
 
     printf("Host:  %s \n", (ret == 0) ? "succeeded" : "failed");
     return ret;

SampleCode/SampleAttestedTLS/client/tls_client.edl

@@ -32,17 +32,16 @@
 
 enclave {
     from "sgx_tstdc.edl" import *;
-	from "enclave.edl" import *;
-	from "sgx_socket.edl" import *;
-	from "sgx_tsgxssl.edl" import *;
-	from "sgx_ttls.edl" import *;
-	from "sgx_pthread.edl" import *;
+    from "enclave.edl" import *;
+    from "sgx_socket.edl" import *;
+    from "sgx_tsgxssl.edl" import *;
+    from "sgx_ttls.edl" import *;
+    from "sgx_pthread.edl" import *;
 
-	include "sgx_ttls.h"
-	trusted {
-		public int launch_tls_client(
-                       [in, string] char* server_name,
-                       [in, string] char* server_port);
+    include "sgx_ttls.h"
+    trusted {
+        public int launch_tls_client(
+                [in, string] char* server_name,
+                [in, string] char* server_port);
     };
-
 };