From 28ed56e13045f42bf01a7287461cf8226a98cbba Mon Sep 17 00:00:00 2001
From: Levi Neely <141506390+lneely@users.noreply.github.com>
Date: Tue, 2 Jul 2024 10:04:49 +0200
Subject: [PATCH] trying a different approach; upgrading pupload.c

---
 CMakeLists.txt        | 12 +++++++++++-
 Makefile              |  3 +++
 lib/pclsync/Makefile  |  2 +-
 lib/pclsync/pupload.c | 12 +++++++-----
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31da671..f922b5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ link_directories(${Boost_LIBRARY_DIR})
 set (CMAKE_C_FLAGS "-fPIC -g")
 set (PCLSYNC_PATH ${CMAKE_SOURCE_DIR}/lib/pclsync)
 set (MBEDTLS_PATH ${CMAKE_SOURCE_DIR}/lib/mbedtls-1.3.10)
+set (MBEDTLS2_PATH ${CMAKE_SOURCE_DIR}/lib/mbedtls-2.1.14)
 set (CMD_PATH ${CMAKE_SOURCE_DIR}/cmd/pcloudcc)
 
 #add_subdirectory(${MBEDTLS_PATH})
@@ -32,6 +33,12 @@ add_custom_target(
   WORKING_DIRECTORY ${MBEDTLS_PATH}
 ) 
 
+add_custom_target(
+  mbedtls2
+  COMMAND cmake . && make
+  WORKING_DIRECTORY ${MBEDTLS2_PATH}
+) 
+
 set (OVERLAY_CLENT_PATH ${CMAKE_SOURCE_DIR}/lib/poverlay_linux)
 include_directories(${OVERLAY_CLENT_PATH})
 
@@ -40,6 +47,9 @@ add_library(pcloudcc_lib SHARED ${CMD_PATH}/pclsync_lib_c.cpp ${CMD_PATH}/pclsyn
 target_link_libraries(pcloudcc_lib
 	${PCLSYNC_PATH}/psynclib.a
 	${MBEDTLS_PATH}/build/library/libmbedtls.a
+	${MBEDTLS2_PATH}/build/library/libmbedcrypto.a		
+	${MBEDTLS2_PATH}/build/library/libmbedx509.a				
+	${MBEDTLS2_PATH}/build/library/libmbedtls.a		
 	fuse
 	pthread
 	sqlite3
@@ -53,7 +63,7 @@ target_link_libraries(pcloudcc pcloudcc_lib)
 
 target_link_libraries(pcloudcc ${Boost_LIBRARIES})
 
-link_directories(${PCLSYNC_PATH} ${MBEDTLS_PATH}/build/library ${OVERLAY_CLENT_PATH})
+link_directories(${PCLSYNC_PATH} ${MBEDTLS_PATH}/build/library ${MBEDTLS2_PATH}/build/library ${OVERLAY_CLENT_PATH})
 
 install(TARGETS pcloudcc RUNTIME DESTINATION bin)
 install(TARGETS pcloudcc_lib LIBRARY DESTINATION lib)
diff --git a/Makefile b/Makefile
index 26f6d37..ea23d53 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 all:
 	make -C ./lib/pclsync fs
+	cmake -DCMAKE_BUILD_TYPE=Debug -H./lib/mbedtls-1.3.10 -B./lib/mbedtls-1.3.10/build
+	make -C ./lib/mbedtls-1.3.10/build
 	cmake -DCMAKE_BUILD_TYPE=Debug -H./lib/mbedtls-2.1.14 -B./lib/mbedtls-2.1.14/build
 	make -C ./lib/mbedtls-2.1.14/build
 	mkdir -p ./cmd/pcloudcc/build
@@ -8,6 +10,7 @@ all:
 
 clean:
 	make -C lib/pclsync clean
+	rm -rf lib/mbedtls-1.3.10/build
 	rm -rf lib/mbedtls-2.1.14/build
 	rm -rf ./cmd/pcloudcc/build
 
diff --git a/lib/pclsync/Makefile b/lib/pclsync/Makefile
index f29c3d4..edc7d2b 100644
--- a/lib/pclsync/Makefile
+++ b/lib/pclsync/Makefile
@@ -9,7 +9,7 @@ CFLAGS=-Werror -O2 -g -fno-stack-protector -fomit-frame-pointer -mtune=core2 -I.
 LIB_A=psynclib.a
 UNAME_S := $(shell uname -s)
 UNAME_V := $(shell uname -v)
-CFLAGS += -DP_OS_LINUX -D_FILE_OFFSET_BITS=64 -DP_SSL_MBEDTLS -I../mbedtls-1.3.10/include
+CFLAGS += -DP_OS_LINUX -D_FILE_OFFSET_BITS=64 -DP_SSL_MBEDTLS -I../mbedtls-1.3.10/include -I ../mbedtls-2.1.14/include
 LDFLAGS += -lssl -lcrypto -lfuse -lpthread -lsqlite3 -lzlib
 
 OBJ=pcompat.o psynclib.o plocks.o plibs.o pcallbacks.o pdiff.o pstatus.o papi.o ptimer.o\
diff --git a/lib/pclsync/pupload.c b/lib/pclsync/pupload.c
index 36b81d2..73cdb6d 100644
--- a/lib/pclsync/pupload.c
+++ b/lib/pclsync/pupload.c
@@ -29,14 +29,16 @@
    DAMAGE.
 */
 
-#include <polarssl/ctr_drbg.h>
-#include <polarssl/debug.h>
-#include <polarssl/entropy.h>
-#include <polarssl/pkcs5.h>
-#include <polarssl/ssl.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/debug.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/pkcs5.h>
+#include <mbedtls/ssl.h>
 #include <pthread.h>
 #include <stddef.h>
 
+#include "mbedtls/compat-1.3.h"
+
 #include "papi.h"
 #include "pcallbacks.h"
 #include "pcompat.h"