lkn
/
pcloudcc-lneely
mirror of https://github.com/lneely/pcloudcc-lneely.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pcloudcc compiles with upgraded library mbedtls-2.x

This commit is contained in:
Levi Neely 2024-06-30 21:11:57 +02:00
parent 2b4e659d42
commit 8ccdb71ab8
32 changed files with 255 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -4,6 +4,8 @@
/lib/pclsync/compile_commands.json
/lib/mbedtls-1.3.10/build
/lib/mbedtls-1.3.10/library/Makefile
/lib/mbedtls-2.1.14/build
/lib/mbedtls-2.1.14/library/Makefile
/build
/CMakeFiles/
/cmake_install.cmake

4
CMakeLists.txt
View File

@ -15,7 +15,7 @@ link_directories(${Boost_LIBRARY_DIR})
#set (CMAKE_CXX_FLAGS "-Wl,-Bstatic")
set (CMAKE_C_FLAGS "-fPIC")
set (PCLSYNC_PATH ${CMAKE_SOURCE_DIR}/lib/pclsync)
set (MBEDTLS_PATH ${CMAKE_SOURCE_DIR}/lib/mbedtls-1.3.10)
set (MBEDTLS_PATH ${CMAKE_SOURCE_DIR}/lib/mbedtls-2.1.14)
set (CMD_PATH ${CMAKE_SOURCE_DIR}/cmd/pcloudcc)
#add_subdirectory(${MBEDTLS_PATH})
@ -40,6 +40,8 @@ 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
${MBEDTLS_PATH}/build/library/libmbedx509.a
${MBEDTLS_PATH}/build/library/libmbedcrypto.a
fuse
pthread
sqlite3

6
Makefile
View File

@ -1,14 +1,14 @@
all:
make -C ./lib/pclsync fs
cmake -H./lib/mbedtls-1.3.10 -B./lib/mbedtls-1.3.10/build
make -C ./lib/mbedtls-1.3.10/build
cmake -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
cmake -H. -B./cmd/pcloudcc/build
make -C ./cmd/pcloudcc/build
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

20
lib/mbedtls-2.1.14/CMakeLists.txt
View File

@ -58,20 +58,20 @@ if(CMAKE_COMPILER_IS_GNU)
# note: starting with CMake 2.8 we could use CMAKE_C_COMPILER_VERSION
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
OUTPUT_VARIABLE GCC_VERSION)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wwrite-strings")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wwrite-strings -fPIC")
if (GCC_VERSION VERSION_GREATER 4.5 OR GCC_VERSION VERSION_EQUAL 4.5)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op -fPIC")
endif()
if (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow -fPIC")
endif()
set(CMAKE_C_FLAGS_RELEASE "-O2")
set(CMAKE_C_FLAGS_DEBUG "-O0 -g3")
set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage")
set(CMAKE_C_FLAGS_ASAN "-Werror -fsanitize=address -fno-common -O3")
set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls ")
set(CMAKE_C_FLAGS_CHECK "-Werror -Os")
set(CMAKE_C_FLAGS_CHECKFULL "${CMAKE_C_FLAGS_CHECK} -Wcast-qual")
set(CMAKE_C_FLAGS_RELEASE "-O2 -fPIC")
set(CMAKE_C_FLAGS_DEBUG "-O0 -g3 -fPIC")
set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage -fPIC")
set(CMAKE_C_FLAGS_ASAN "-Werror -fsanitize=address -fno-common -O3 -fPIC")
set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fPIC ")
set(CMAKE_C_FLAGS_CHECK "-Werror -Os -fPIC")
set(CMAKE_C_FLAGS_CHECKFULL "${CMAKE_C_FLAGS_CHECK} -Wcast-qual -fPIC")
endif(CMAKE_COMPILER_IS_GNU)
if(CMAKE_COMPILER_IS_CLANG)

2
lib/pclsync/Makefile
View File

@ -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-2.1.14/include -fPIC
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\

13
lib/pclsync/pasyncnet.c
View File

@ -27,13 +27,16 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 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/sha1.h>
#include <mbedtls/ssl.h>
#include <pthread.h>
#include "mbedtls/compat-1.3.h"
#include "papi.h"
#include "pasyncnet.h"
#include "pcompat.h"

12
lib/pclsync/pcache.c
View File

@ -28,13 +28,15 @@
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 "mbedtls/compat-1.3.h"
#include "pcache.h"
#include "pcompat.h"
#include "plibs.h"

14
lib/pclsync/pcloudcrypto.c
View File

@ -29,13 +29,17 @@
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/sha1.h>
#include <mbedtls/sha256.h>
#include <mbedtls/ssl.h>
#include <pthread.h>
#include "mbedtls/compat-1.3.h"
#include "papi.h"
#include "pcache.h"
#include "pcloudcrypto.h"

12
lib/pclsync/pcompat.c
View File

@ -28,11 +28,13 @@
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 "mbedtls/compat-1.3.h"
#include "pcompat.h"
#include "plibs.h"

12
lib/pclsync/pcrypto.c
View File

@ -29,13 +29,15 @@
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 "mbedtls/compat-1.3.h"
#include "pcompat.h"
#include "pcompiler.h"

14
lib/pclsync/pdiff.c
View File

@ -30,14 +30,18 @@
*/
#include <ctype.h>
#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/sha1.h>
#include <mbedtls/sha512.h>
#include <mbedtls/ssl.h>
#include <pthread.h>
#include <stddef.h>
#include "mbedtls/compat-1.3.h"
#include "paccountevents.h"
#include "papi.h"
#include "pbusinessaccount.h"

14
lib/pclsync/pdownload.c
View File

@ -28,14 +28,18 @@
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/sha1.h>
#include <mbedtls/sha512.h>
#include <mbedtls/ssl.h>
#include <pthread.h>
#include <stddef.h>
#include "mbedtls/compat-1.3.h"
#include "papi.h"
#include "pasyncnet.h"
#include "pcallbacks.h"

12
lib/pclsync/pfolder.c
View File

@ -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 "pcloudcrypto.h"
#include "pdiff.h"

12
lib/pclsync/pfs.c
View File

@ -31,13 +31,15 @@
#define FUSE_USE_VERSION 26
#define _FILE_OFFSET_BITS 64
#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 "mbedtls/compat-1.3.h"
#include "pcloudcrypto.h"
#include "pcompat.h"
#include "pfolder.h"

14
lib/pclsync/pfscrypto.c
View File

@ -29,18 +29,20 @@
DAMAGE.
*/
#include <polarssl/ctr_drbg.h>
#include <polarssl/debug.h>
#include <polarssl/entropy.h>
#include <polarssl/pkcs5.h>
#include <polarssl/ssl.h>
#include <ctype.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 "mbedtls/compat-1.3.h"
#include "pcloudcrypto.h"
#include "pfscrypto.h"
#include "plibs.h"
#include "ppagecache.h"
#include <ctype.h>
// this is only for debug, adds needless checks of tree for local files
#if IS_DEBUG

12
lib/pclsync/pfsfolder.c
View File

@ -29,13 +29,15 @@
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 "mbedtls/compat-1.3.h"
#include "pcloudcrypto.h"
#include "pfolder.h"
#include "pfs.h"

12
lib/pclsync/pfstasks.c
View File

@ -29,13 +29,15 @@
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 "mbedtls/compat-1.3.h"
#include "pcache.h"
#include "pcloudcrypto.h"
#include "pcompat.h"

12
lib/pclsync/pfsupload.c
View File

@ -29,13 +29,15 @@
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 "mbedtls/compat-1.3.h"
#include "pcache.h"
#include "pdiff.h"
#include "pfileops.h"

17
lib/pclsync/plocalscan.c
View File

@ -29,12 +29,17 @@
DAMAGE.
*/
#include <polarssl/ctr_drbg.h>
#include <polarssl/debug.h>
#include <polarssl/entropy.h>
#include <polarssl/pkcs5.h>
#include <polarssl/ssl.h>
#include <ctype.h>
#include <mbedtls/ctr_drbg.h>
#include <mbedtls/debug.h>
#include <mbedtls/entropy.h>
#include <mbedtls/pkcs5.h>
#include <mbedtls/sha256.h>
#include <mbedtls/ssl.h>
#include <pthread.h>
#include <string.h>
#include "mbedtls/compat-1.3.h"
#include "pcallbacks.h"
#include "pfolder.h"
@ -50,8 +55,6 @@
#include "ptasks.h"
#include "ptimer.h"
#include "pupload.h"
#include <ctype.h>
#include <string.h>
typedef struct {
psync_list list;

12
lib/pclsync/pmemlock.c
View File

@ -29,13 +29,15 @@
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 "mbedtls/compat-1.3.h"
#include "pcloudcrypto.h"
#include "pcompat.h"
#include "pintervaltree.h"

22
lib/pclsync/pnetlibs.c
View File

@ -29,12 +29,20 @@
DAMAGE.
*/
#include <polarssl/ctr_drbg.h>
#include <polarssl/debug.h>
#include <polarssl/entropy.h>
#include <polarssl/pkcs5.h>
#include <polarssl/ssl.h>
#include <ctype.h>
#include <mbedtls/ctr_drbg.h>
#include <mbedtls/debug.h>
#include <mbedtls/entropy.h>
#include <mbedtls/pkcs5.h>
#include <mbedtls/sha1.h>
#include <mbedtls/sha512.h>
#include <mbedtls/ssl.h>
#include <pthread.h>
#include <semaphore.h>
#include <stdarg.h>
#include <stdio.h>
#include "mbedtls/compat-1.3.h"
#include "papi.h"
#include "pcache.h"
@ -45,10 +53,6 @@
#include "pstatus.h"
#include "ptimer.h"
#include "ptree.h"
#include <ctype.h>
#include <semaphore.h>
#include <stdarg.h>
#include <stdio.h>
struct time_bytes {
time_t tm;

13
lib/pclsync/pp2p.c
View File

@ -29,13 +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/sha1.h>
#include <mbedtls/ssl.h>
#include <pthread.h>
#include "mbedtls/compat-1.3.h"
#include "papi.h"
#include "pcompat.h"
#include "pcrypto.h"

12
lib/pclsync/ppagecache.c
View File

@ -29,13 +29,15 @@
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 "mbedtls/compat-1.3.h"
#include "pcache.h"
#include "pcrc32c.h"
#include "pfscrypto.h"

13
lib/pclsync/ppassword.c
View File

@ -28,13 +28,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/rsa.h>
#include <mbedtls/ssl.h>
#include <pthread.h>
#include "mbedtls/compat-1.3.h"
#include "plibs.h"
#include "ppassword.h"
#include "ppassworddict.h"

15
lib/pclsync/ppathstatus.c
View File

@ -29,12 +29,15 @@
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 <string.h>
#include "mbedtls/compat-1.3.h"
#include "pcloudcrypto.h"
#include "pfolder.h"
@ -45,8 +48,6 @@
#include "pstatus.h"
#include "ptasks.h"
#include "ptree.h"
#include <ctype.h>
#include <string.h>
#define PATH_CACHE_SIZE 512
#define PATH_HASH_SIZE 512

12
lib/pclsync/psettings.c
View File

@ -29,13 +29,15 @@
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 "mbedtls/compat-1.3.h"
#include "pfs.h"
#include "plibs.h"
#include "plocalscan.h"

54
lib/pclsync/pssl.c
View File

@ -30,14 +30,18 @@
*/
#include <ctype.h>
#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/net.h>
#include <mbedtls/pkcs5.h>
#include <mbedtls/sha256.h>
#include <mbedtls/ssl.h>
#include <pthread.h>
#include <stddef.h>
#include "mbedtls/compat-1.3.h"
#include "pcompat.h"
#include "pcompiler.h"
@ -132,6 +136,7 @@ typedef struct {
typedef struct {
ssl_context ssl;
mbedtls_ssl_config conf;
psync_socket_t sock;
int isbroken;
char cachekey[];
@ -209,9 +214,13 @@ int psync_ssl_init() {
entropy_init(&psync_mbed_entropy);
psync_get_random_seed(seed, seed, sizeof(seed), 0);
entropy_update_manual(&psync_mbed_entropy, seed, sizeof(seed));
/*
if (ctr_drbg_init(&psync_mbed_rng.rnd, entropy_func, &psync_mbed_entropy,
NULL, 0))
return PRINT_RETURN(-1);
*/
ctr_drbg_init(&psync_mbed_rng.rnd);
x509_crt_init(&psync_mbed_trusted_certs_x509);
for (i = 0; i < ARRAY_SIZE(psync_ssl_trusted_certs); i++)
if (x509_crt_parse(&psync_mbed_trusted_certs_x509,
@ -239,6 +248,12 @@ static ssl_connection_t *psync_ssl_alloc_conn(const char *hostname) {
return conn;
}
static mbedtls_ssl_config *psync_ssl_alloc_config() {
mbedtls_ssl_config *cfg;
cfg = malloc(sizeof(mbedtls_ssl_config));
return cfg;
}
static void psync_set_ssl_error(ssl_connection_t *conn, int err) {
if (err == POLARSSL_ERR_NET_WANT_READ)
psync_ssl_errno = PSYNC_SSL_ERR_WANT_READ;
@ -341,22 +356,23 @@ static int psync_ssl_check_peer_public_key(ssl_connection_t *conn) {
int psync_ssl_connect(psync_socket_t sock, void **sslconn,
const char *hostname) {
ssl_connection_t *conn;
mbedtls_ssl_config *cfg;
ssl_session *sess;
int ret;
conn = psync_ssl_alloc_conn(hostname);
if (unlikely(ssl_init(&conn->ssl)))
goto err0;
cfg = psync_ssl_alloc_config();
ssl_init(&conn->ssl);
conn->sock = sock;
ssl_set_endpoint(&conn->ssl, SSL_IS_CLIENT);
ssl_set_dbg(&conn->ssl, debug_cb, debug_ctx);
ssl_set_authmode(&conn->ssl, SSL_VERIFY_REQUIRED);
ssl_set_min_version(&conn->ssl, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3);
ssl_set_ca_chain(&conn->ssl, &psync_mbed_trusted_certs_x509, NULL, hostname);
ssl_set_ciphersuites(&conn->ssl, psync_mbed_ciphersuite);
ssl_set_rng(&conn->ssl, ctr_drbg_random_locked, &psync_mbed_rng);
ssl_set_bio(&conn->ssl, psync_mbed_read, conn, psync_mbed_write, conn);
ssl_set_hostname(&conn->ssl, hostname); // we do not need SNI, but should not
// hurt in general to support
ssl_set_endpoint(&conn->conf, SSL_IS_CLIENT);
ssl_set_dbg(&conn->conf, debug_cb, debug_ctx);
ssl_set_authmode(&conn->conf, SSL_VERIFY_REQUIRED);
ssl_set_min_version(&conn->conf, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3);
ssl_set_ca_chain(&conn->conf, &psync_mbed_trusted_certs_x509, NULL);
ssl_set_ciphersuites(&conn->conf, psync_mbed_ciphersuite);
ssl_set_rng(&conn->conf, ctr_drbg_random_locked, &psync_mbed_rng);
// XXX: may not be needed
// ssl_set_bio(&conn->ssl, psync_mbed_read, conn, psync_mbed_write, conn);
if ((sess = (ssl_session *)psync_cache_get(conn->cachekey))) {
debug(D_NOTICE, "reusing cached session for %s", hostname);
if (ssl_set_session(&conn->ssl, sess))
@ -631,7 +647,7 @@ psync_ssl_gen_symmetric_key_from_pass(const char *password, size_t keylen,
key->keylen = keylen;
pkcs5_pbkdf2_hmac(&ctx, (const unsigned char *)password, strlen(password),
salt, saltlen, iterations, keylen, key->key);
md_free_ctx(&ctx);
md_free(&ctx);
return key;
}
@ -654,7 +670,7 @@ char *psync_ssl_derive_password_from_passphrase(const char *username,
pkcs5_pbkdf2_hmac(&ctx, (const unsigned char *)passphrase, strlen(passphrase),
usersha512, PSYNC_SHA512_DIGEST_LEN, 5000,
sizeof(passwordbin), passwordbin);
md_free_ctx(&ctx);
md_free(&ctx);
usercopy = psync_base64_encode(passwordbin, sizeof(passwordbin), &userlen);
return (char *)usercopy;
}

4
lib/pclsync/pssl.h
View File

@ -91,8 +91,8 @@ typedef struct {
typedef aes_context *psync_aes256_encoder;
typedef aes_context *psync_aes256_decoder;
typedef void (*psync_ssl_debug_callback_t)(void *ctx, int level,
const char *message);
typedef void (*psync_ssl_debug_callback_t)(void *, int, const char *, int,
const char *);
void psync_ssl_set_log_threshold(int threshold);
void psync_ssl_set_debug_callback(psync_ssl_debug_callback_t cb, void *ctx);

14
lib/pclsync/psyncer.c
View File

@ -29,13 +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 <string.h>
#include "mbedtls/compat-1.3.h"
#include "pcallbacks.h"
#include "pdownload.h"
@ -48,7 +51,6 @@
#include "psyncer.h"
#include "ptasks.h"
#include "ptree.h"
#include <string.h>
typedef struct {
psync_tree tree;

16
lib/pclsync/psynclib.c
View File

@ -30,14 +30,16 @@
*/
#include <ctype.h>
#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 "pasyncnet.h"
#include "pbusinessaccount.h"
@ -206,7 +208,9 @@ static void psync_stop_crypto_on_sleep() {
}
}
static void ssl_debug_cb(void *ctx, int level, const char *msg) {
// TODO: figure out what the new args are
static void ssl_debug_cb(void *ctx, int level, const char *msg, int TODO1,
const char *TODO2) {
debug(D_NOTICE, "%s", msg);
}

12
lib/pclsync/ptasks.c
View File

@ -29,13 +29,15 @@
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 "mbedtls/compat-1.3.h"
#include "pcallbacks.h"
#include "pdownload.h"
#include "plibs.h"

12
lib/pclsync/pupload.c
View File

@ -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"