Links - set up old version of protobufs on crysp-server1 (2.6.1).

Makefile changed to make linker not look in the (not cleanly un-
installed) location of the new protobufs

App/LocalAttestationUntrusted.cpp

@@ -188,7 +188,6 @@ namespace LocalAttestationUntrusted {
         printf("/n");
 
         fflush(stdout);
-
         return 0;
 
     }
@@ -229,11 +228,6 @@ namespace LocalAttestationUntrusted {
         printf("\n");
         fflush(stdout);
 
-        /*
-        uint8_t *output_ciphertext_plus_tag = (uint8_t *) malloc(
-                4100); // 12 bytes for ciphertext iv + 16 bytes for ciphertext tag = 28 byte
-        uint8_t *input_ciphertext_plus_tag = (uint8_t *) malloc(4100);
-        */
         time_file_fd = open("decryptor_time.txt", O_APPEND | O_WRONLY);
 
         do {

Makefile

@@ -98,7 +98,8 @@ else
 	App_Compile_Flags += -DNDEBUG -UEDEBUG -UDEBUG
 endif
 
-App_Link_Flags := $(SGX_COMMON_CFLAGS) $(Security_Link_Flags) -L$(SGX_LIBRARY_PATH) -l$(Urts_Library_Name) -lsgx_uae_service -L$(OPENSSL_LIBRARY_PATH) -lsgx_usgxssl -lpthread -L/usr/local/lib -lprotobuf #-L$(OPENSSL_BAREBONES_LIBRARY_PATH) -lcrypto
+App_Link_Flags := $(SGX_COMMON_CFLAGS) $(Security_Link_Flags) -L$(SGX_LIBRARY_PATH) -l$(Urts_Library_Name) -lsgx_uae_service -L$(OPENSSL_LIBRARY_PATH) -lsgx_usgxssl -lpthread -lprotobuf
+#-L$(OPENSSL_BAREBONES_LIBRARY_PATH) -lcrypto
 
 ifneq ($(SGX_MODE), HW)
 	App_Link_Flags += -lsgx_uae_service_sim
@@ -106,7 +107,6 @@ else
 	App_Link_Flags += -lsgx_uae_service
 endif
 
-App_Cpp_Objects := App/App.o App/LocalAttestationUntrusted.o App/protobufLAInitiator.o App/protobufSgxLATransformsInitiator.o App/ProtobufLAMessages.pb.o #$(App_Cpp_Files:.cpp=.o)
 App_Name := app
 
 ######## Enclave Settings ########
@@ -216,7 +216,7 @@ App/%.o: App/%.cpp Decryptor/Decryptor_u.h
 	@$(CXX) $(App_Compile_Flags) -c $< -o $@
 	@echo "CXX  <=  $<"
 
-$(App_Name): App/App.o App/SealingUntrusted.o App/LocalAttestationUntrusted.o App/protobufLAInitiator.o App/protobufSgxTransformsInitiator.o App/protobufSgxTransformsHelper.o App/PostLAProtobufNativeTransforms.o  App/protobufReadWrite.o App/ProtobufLAMessages.pb.o App/PostLAMessages.pb.o App/Ipc.o App/FileIO.o App/Decryptor_u.o
+$(App_Name): App/App.o App/SealingUntrusted.o App/LocalAttestationUntrusted.o App/protobufLAInitiator.o App/protobufSgxTransformsInitiator.o App/protobufSgxTransformsHelper.o App/PostLAProtobufNativeTransforms.o App/protobufReadWrite.o App/ProtobufLAMessages.pb.o App/PostLAMessages.pb.o App/Ipc.o App/FileIO.o App/Decryptor_u.o
 	@$(CXX) -Wl,--no-undefined $^ -o $@ $(App_Link_Flags)
 	@echo "LINK =>  $@"