Pre-verification changes - ecdsa verification function remains in decryptor.cpp but is not being called

App/App.cpp

@@ -230,7 +230,7 @@ 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, &pub_key);
+    ret_status=local_attestation_initiator(3825, 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);

App/systemLA.cpp

@@ -99,7 +99,7 @@ int set_up_socket(int port,   sockaddr_in* address)
   return server_fd;
 }
 
-int local_attestation_initiator(int port, uint32_t own_enclave_id, sgx_ec256_public_t* pub_key)
+int local_attestation_initiator(int port, uint32_t own_enclave_id)
 {
   // declare msg1, msg2, msg3 protobuf objects
   protobuf_sgx_dh_msg1_t protobuf_msg1;
@@ -186,7 +186,7 @@ Decryptor_decrypt_verifiers_message_set_apache_mrsigner(own_enclave_id, &sgx_ret
 	
 //uint32_t create_and_encrypt_mitigator_header_value(uint8_t* plaintext_sign_data_and_sign, uint8_t* encrypted_sign_data_and_sign, uint8_t* tag);
 
-	Decryptor_create_and_encrypt_mitigator_header_value(own_enclave_id, &sgx_ret, plaintext_sign_data_and_sign, encrypted_sign_data_and_sign_and_tag , encrypted_sign_data_and_sign_and_tag+160, pub_key);
+	Decryptor_create_and_encrypt_mitigator_header_value(own_enclave_id, &sgx_ret, plaintext_sign_data_and_sign, encrypted_sign_data_and_sign_and_tag , encrypted_sign_data_and_sign_and_tag+160);
 	if(sgx_ret!=0)
 	{
 		printf("Error in generating encrypted mitigator header:0x%x\n", sgx_ret); fflush(stdout); return 0xf3;

Decryptor/Decryptor.cpp

@@ -108,7 +108,7 @@ return 	decrypt(ciphertext, 32, tag, (uint8_t*) &(apache_mr_signer.m));
 }
 
 // signature_data - 96 bytes, encrypted_signature assumed to be at least 64 bytes, tag - at least 16 bytes
-uint32_t create_and_encrypt_mitigator_header_value(uint8_t* plaintext_sign_data_and_sign, uint8_t* encrypted_sign_data_and_sign, uint8_t* tag, sgx_ec256_public_t* pub_key)
+uint32_t create_and_encrypt_mitigator_header_value(uint8_t* plaintext_sign_data_and_sign, uint8_t* encrypted_sign_data_and_sign, uint8_t* tag)
 {
 	uint32_t count;
 	uint8_t sign_data_and_sign[160]; 
@@ -118,13 +118,13 @@ uint32_t create_and_encrypt_mitigator_header_value(uint8_t* plaintext_sign_data_
 		//      printf("Could not generate or sign another keypair for client-side, error:%x.\n", ret_status); fflush(stdout);
 		return 0xFFFFFFDD;
 	}
-	ret_status=verify_mitigator_header_value(sign_data_and_sign, sign_data_and_sign+96, pub_key); 
-	if(ret_status !=0)
-		return ret_status; 
-//	for(count=0; count<160; count++)
-//		*(plaintext_sign_data_and_sign+count)=sign_data_and_sign[count]; 
+//	ret_status=verify_mitigator_header_value(sign_data_and_sign, sign_data_and_sign+96, pub_key); 
+//	if(ret_status !=0)
+//		return ret_status; 
+	for(count=0; count<160; count++)
+		*(plaintext_sign_data_and_sign+count)=sign_data_and_sign[count]; 
 
-//	ret_status = encrypt_internal(sign_data_and_sign, 160, tag, encrypted_sign_data_and_sign); 
+	ret_status = encrypt_internal(sign_data_and_sign, 160, tag, encrypted_sign_data_and_sign); 
 	return ret_status; 
 }
 

Decryptor/Decryptor.edl

@@ -45,7 +45,7 @@ enclave {
         public uint32_t calculate_sealed_data_size(uint32_t input_size); 
 public uint32_t decrypt_verifiers_message_set_apache_mrsigner([in, size=32] uint8_t* ciphertext, [in, size=16] uint8_t* tag);
 //public uint32_t create_and_encrypt_mitigator_header_value([out, size=96] uint8_t* signature_data, [out, size=64] uint8_t* plaintext_signature, [out, size=64] uint8_t* encrypted_signature, [out, size=16] uint8_t* tag);
-public uint32_t create_and_encrypt_mitigator_header_value([out, size=160] uint8_t* plaintext_sign_data_and_sign, [out, size=160] uint8_t* encrypted_sign_data_and_sign, [out, size=16] uint8_t* tag, [in] sgx_ec256_public_t* pub_key);
+public uint32_t create_and_encrypt_mitigator_header_value([out, size=160] uint8_t* plaintext_sign_data_and_sign, [out, size=160] uint8_t* encrypted_sign_data_and_sign, [out, size=16] uint8_t* tag);
 
 
 

Include/systemLA.h

@@ -1 +1 @@
-int local_attestation_initiator(int port, uint32_t own_enclave_id, sgx_ec256_public_t* pub_key);
+int local_attestation_initiator(int port, uint32_t own_enclave_id);