Browse Source

Works with verifier + Apache!

dettanym 5 years ago
parent
commit
0ee2a787ef
3 changed files with 13 additions and 3 deletions
  1. 11 1
      App/App.cpp
  2. 1 1
      App/systemLA.cpp
  3. 1 1
      Decryptor/Decryptor.cpp

+ 11 - 1
App/App.cpp

@@ -230,12 +230,22 @@ int main(__attribute__((unused)) int argc, __attribute__((unused)) char* argv[])
     close(sealed_signing_key_fd);
     
     // LA with the verifier 
-    ret_status=local_attestation_initiator(3825, e2_enclave_id);
+    ret_status=local_attestation_initiator(3824, e2_enclave_id);
     if(ret_status!=0)
     {
         printf("local attestation - with the verifier - did not successfully return: %x\n", ret_status); fflush(stdout);     sgx_destroy_enclave(e2_enclave_id);
         return 0xFFFFFFFF;
     }
+
+    ret_status=local_attestation_initiator(3825, e2_enclave_id);
+    if(ret_status!=0)
+    {
+        printf("local attestation - with the apache - did not successfully return: %x\n", ret_status); fflush(stdout);     sgx_destroy_enclave(e2_enclave_id);
+        return 0xFFFFFFFF;
+    }
+
+
+
 /*
     // LA with the apache - currently set to return failure - should change it to success when the code to send the mrsigner from the verifier to the decryptor is added- TODO: <--- that 
     ret_status=local_attestation_initiator(3826, e2_enclave_id); // TODO: Change port or sth

+ 1 - 1
App/systemLA.cpp

@@ -150,7 +150,7 @@ int local_attestation_initiator(int port, uint32_t own_enclave_id)
 
   if(write_protobuf_msg_to_fd(accept_fd, protobuf_msg3)!=0)
     return -1;
-  read_or_write=0;  
+//  read_or_write=0;  
 
   printf("Here\n"); fflush(stdout); 
   if(read_or_write)

+ 1 - 1
Decryptor/Decryptor.cpp

@@ -359,7 +359,7 @@ uint32_t verify_mitigator_header_value(uint8_t* signature_data, uint8_t* signatu
         return 0;
 }
 
-uint32_t derive_shared_secret_for_client()
+uint32_t derive_shared_secret_for_client(uint8_t* pub_key, uint8_t* shared_key)
 {
 	return 0;