transient ssl dependencies

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
+CFLAGS += -DP_OS_LINUX -D_FILE_OFFSET_BITS=64 -DP_SSL_MBEDTLS -I../mbedtls/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\
@@ -22,10 +22,6 @@ OBJ=pcompat.o psynclib.o plocks.o plibs.o pcallbacks.o pdiff.o pstatus.o papi.o
 OBJFS=pfs.o ppagecache.o pfsfolder.o pfstasks.o pfsupload.o pintervaltree.o pfsxattr.o\
 	pcloudcrypto.o pfscrypto.o pcrc32c.o pfsstatic.o plocks.o
 
-# committing to mbedtls
-OBJ += pssl-mbedtls.o
-CFLAGS += -DP_SSL_MBEDTLS -I../mbedtls/include
-
 OBJ1=overlay_client.o
 
 all: $(LIB_A)

lib/pclsync/pasyncnet.c

@@ -27,8 +27,15 @@
   EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "pasyncnet.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "papi.h"
+#include "pasyncnet.h"
 #include "pcompat.h"
 #include "pcompression.h"
 #include "plibs.h"

lib/pclsync/pcache.c

@@ -28,6 +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 <pthread.h>
+
 #include "pcache.h"
 #include "pcompat.h"
 #include "plibs.h"

lib/pclsync/pcloudcrypto.c

@@ -29,9 +29,16 @@
    DAMAGE.
 */
 
-#include "pcloudcrypto.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "papi.h"
 #include "pcache.h"
+#include "pcloudcrypto.h"
 #include "pcrypto.h"
 #include "pdiff.h"
 #include "pfileops.h"

lib/pclsync/pcompat.c

@@ -28,6 +28,12 @@
    DAMAGE.
 */
 
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+
 #include "pcompat.h"
 #include "plibs.h"
 #include "psettings.h"

lib/pclsync/pcrypto.c

@@ -29,6 +29,18 @@
    DAMAGE.
 */
 
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
+#include "pcompat.h"
+#include "pcompiler.h"
+
+#include "pssl.h"
+
 #include "pcrypto.h"
 #include "plibs.h"
 #include "pmemlock.h"

lib/pclsync/pdiff.c

@@ -29,7 +29,15 @@
    DAMAGE.
 */
 
-#include "pdiff.h"
+#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 <pthread.h>
+#include <stddef.h>
+
 #include "paccountevents.h"
 #include "papi.h"
 #include "pbusinessaccount.h"
@@ -38,6 +46,7 @@
 #include "pcloudcrypto.h"
 #include "pcompat.h"
 #include "pcontacts.h"
+#include "pdiff.h"
 #include "pdownload.h"
 #include "pfileops.h"
 #include "pfolder.h"

lib/pclsync/pdownload.c

@@ -28,10 +28,18 @@
   DAMAGE.
 */
 
-#include "pdownload.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+#include <stddef.h>
+
 #include "papi.h"
 #include "pasyncnet.h"
 #include "pcallbacks.h"
+#include "pdownload.h"
 #include "pfolder.h"
 #include "plibs.h"
 #include "plist.h"

lib/pclsync/pfolder.c

@@ -29,10 +29,18 @@
    DAMAGE.
 */
 
-#include "pfolder.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+#include <stddef.h>
+
 #include "papi.h"
 #include "pcloudcrypto.h"
 #include "pdiff.h"
+#include "pfolder.h"
 #include "pfsfolder.h"
 #include "plibs.h"
 #include "plist.h"

lib/pclsync/pfs.c

@@ -31,10 +31,17 @@
 #define FUSE_USE_VERSION 26
 #define _FILE_OFFSET_BITS 64
 
-#include "pfs.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pcloudcrypto.h"
 #include "pcompat.h"
 #include "pfolder.h"
+#include "pfs.h"
 #include "pfscrypto.h"
 #include "pfsfolder.h"
 #include "pfsstatic.h"

lib/pclsync/pfscrypto.c

@@ -29,8 +29,15 @@
    DAMAGE.
 */
 
-#include "pfscrypto.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pcloudcrypto.h"
+#include "pfscrypto.h"
 #include "plibs.h"
 #include "ppagecache.h"
 #include <ctype.h>

lib/pclsync/pfsfolder.c

@@ -29,10 +29,17 @@
    DAMAGE.
 */
 
-#include "pfsfolder.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pcloudcrypto.h"
 #include "pfolder.h"
 #include "pfs.h"
+#include "pfsfolder.h"
 #include "pfstasks.h"
 #include "plibs.h"
 #include "psettings.h"

lib/pclsync/pfstasks.c

@@ -29,12 +29,19 @@
    DAMAGE.
 */
 
-#include "pfstasks.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pcache.h"
 #include "pcloudcrypto.h"
 #include "pcompat.h"
 #include "pfolder.h"
 #include "pfs.h"
+#include "pfstasks.h"
 #include "pfsupload.h"
 #include "plibs.h"
 #include "ppathstatus.h"

lib/pclsync/pfsupload.c

@@ -29,12 +29,19 @@
    DAMAGE.
 */
 
-#include "pfsupload.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pcache.h"
 #include "pdiff.h"
 #include "pfileops.h"
 #include "pfscrypto.h"
 #include "pfstasks.h"
+#include "pfsupload.h"
 #include "pfsxattr.h"
 #include "plibs.h"
 #include "plist.h"

lib/pclsync/plocalscan.c

@@ -29,12 +29,19 @@
    DAMAGE.
 */
 
-#include "plocalscan.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pcallbacks.h"
 #include "pfolder.h"
 #include "plibs.h"
 #include "plist.h"
 #include "plocalnotify.h"
+#include "plocalscan.h"
 #include "ppathstatus.h"
 #include "prunratelimit.h"
 #include "psettings.h"

lib/pclsync/pmemlock.c

@@ -29,11 +29,18 @@
    DAMAGE.
 */
 
-#include "pmemlock.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pcloudcrypto.h"
 #include "pcompat.h"
 #include "pintervaltree.h"
 #include "plibs.h"
+#include "pmemlock.h"
 #include "ptree.h"
 #include <stdint.h>
 

lib/pclsync/pnetlibs.c

@@ -29,10 +29,17 @@
    DAMAGE.
 */
 
-#include "pnetlibs.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "papi.h"
 #include "pcache.h"
 #include "plibs.h"
+#include "pnetlibs.h"
 #include "psettings.h"
 #include "pssl.h"
 #include "pstatus.h"

lib/pclsync/pp2p.c

@@ -29,7 +29,13 @@
    DAMAGE.
 */
 
-#include "pp2p.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "papi.h"
 #include "pcompat.h"
 #include "pcrypto.h"
@@ -37,6 +43,7 @@
 #include "pfolder.h"
 #include "plibs.h"
 #include "pnetlibs.h"
+#include "pp2p.h"
 #include "psettings.h"
 #include "pssl.h"
 #include "pstatus.h"

lib/pclsync/ppagecache.c

@@ -29,13 +29,20 @@
    DAMAGE.
 */
 
-#include "ppagecache.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pcache.h"
 #include "pcrc32c.h"
 #include "pfscrypto.h"
 #include "pfsupload.h"
 #include "plibs.h"
 #include "pnetlibs.h"
+#include "ppagecache.h"
 #include "psettings.h"
 #include "pstatus.h"
 #include "ptimer.h"

lib/pclsync/ppassword.c

@@ -28,8 +28,15 @@
   DAMAGE.
 */
 
-#include "ppassword.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "plibs.h"
+#include "ppassword.h"
 #include "ppassworddict.h"
 #include "pssl.h"
 #include <ctype.h>

lib/pclsync/ppathstatus.c

@@ -29,12 +29,19 @@
    DAMAGE.
 */
 
-#include "ppathstatus.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pcloudcrypto.h"
 #include "pfolder.h"
 #include "pfs.h"
 #include "plibs.h"
 #include "plist.h"
+#include "ppathstatus.h"
 #include "pstatus.h"
 #include "ptasks.h"
 #include "ptree.h"

lib/pclsync/psettings.c

@@ -29,12 +29,19 @@
    DAMAGE.
 */
 
-#include "psettings.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pfs.h"
 #include "plibs.h"
 #include "plocalscan.h"
 #include "pp2p.h"
 #include "ppagecache.h"
+#include "psettings.h"
 #include "ptimer.h"
 #include <ctype.h>
 #include <string.h>

lib/pclsync/pssl.h

@@ -29,17 +29,20 @@
    DAMAGE.
 */
 
+/*
+  Dependencies:
+  - pcompat.h
+  - pcompiler.h
+  - <polarssl/aes.h>
+  - <polarssl/rsa.h>
+  - <polarssl/sha1.h>
+  - <polarssl/sha256.h>
+  - <polarssl/sha512.h>
+*/
+
 #ifndef _PSYNC_SSL_H
 #define _PSYNC_SSL_H
 
-#include "pcompat.h"
-#include "pcompiler.h"
-#include <polarssl/aes.h>
-#include <polarssl/rsa.h>
-#include <polarssl/sha1.h>
-#include <polarssl/sha256.h>
-#include <polarssl/sha512.h>
-
 #define PSYNC_AES256_BLOCK_SIZE 16
 #define PSYNC_AES256_KEY_SIZE 32
 

lib/pclsync/psyncer.c

@@ -29,7 +29,14 @@
    DAMAGE.
 */
 
-#include "psyncer.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+#include <stddef.h>
+
 #include "pcallbacks.h"
 #include "pdownload.h"
 #include "pfolder.h"
@@ -38,6 +45,7 @@
 #include "plocalscan.h"
 #include "ppathstatus.h"
 #include "pstatus.h"
+#include "psyncer.h"
 #include "ptasks.h"
 #include "ptree.h"
 #include <string.h>

lib/pclsync/psynclib.c

@@ -29,7 +29,15 @@
    DAMAGE.
 */
 
-#include "psynclib.h"
+#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 <pthread.h>
+#include <stddef.h>
+
 #include "papi.h"
 #include "pasyncnet.h"
 #include "pbusinessaccount.h"
@@ -62,6 +70,7 @@
 #include "pssl.h"
 #include "pstatus.h"
 #include "psyncer.h"
+#include "psynclib.h"
 #include "ptasks.h"
 #include "ptimer.h"
 #include "ptools.h"
@@ -2216,11 +2225,11 @@ int psync_crypto_reset() {
 
 psync_folderid_t psync_crypto_folderid() {
   int64_t id;
-  id =
+  id = psync_sql_cellint(
-      psync_sql_cellint("SELECT id FROM folder WHERE parentfolderid=0 AND "
+      "SELECT id FROM folder WHERE parentfolderid=0 AND "
-                        "flags&" NTO_STR(PSYNC_FOLDER_FLAG_ENCRYPTED) "=" NTO_STR(
+      "flags&" NTO_STR(PSYNC_FOLDER_FLAG_ENCRYPTED) "=" NTO_STR(
-                            PSYNC_FOLDER_FLAG_ENCRYPTED) " LIMIT 1",
+          PSYNC_FOLDER_FLAG_ENCRYPTED) " LIMIT 1",
-                        0);
+      0);
   if (id)
     return id;
   id = psync_sql_cellint(

lib/pclsync/ptasks.c

@@ -29,12 +29,19 @@
    DAMAGE.
 */
 
-#include "ptasks.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+
 #include "pcallbacks.h"
 #include "pdownload.h"
 #include "plibs.h"
 #include "ppathstatus.h"
 #include "pstatus.h"
+#include "ptasks.h"
 #include "pupload.h"
 
 static void create_task1(psync_uint_t type, psync_syncid_t syncid,

lib/pclsync/pupload.c

@@ -29,7 +29,14 @@
    DAMAGE.
 */
 
-#include "pupload.h"
+#include <polarssl/ctr_drbg.h>
+#include <polarssl/debug.h>
+#include <polarssl/entropy.h>
+#include <polarssl/pkcs5.h>
+#include <polarssl/ssl.h>
+#include <pthread.h>
+#include <stddef.h>
+
 #include "papi.h"
 #include "pcallbacks.h"
 #include "pcompat.h"
@@ -48,6 +55,7 @@
 #include "ptasks.h"
 #include "ptimer.h"
 #include "ptools.h"
+#include "pupload.h"
 
 typedef struct {
   psync_list list;