compat header removed; startcrypto no longer working

lib/pclsync/pasyncnet.c

@@ -35,8 +35,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "papi.h"
 #include "pasyncnet.h"
 #include "pcompat.h"

lib/pclsync/pcache.c

@@ -35,8 +35,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcache.h"
 #include "pcompat.h"
 #include "plibs.h"

lib/pclsync/pcloudcrypto.c

@@ -38,8 +38,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "papi.h"
 #include "pcache.h"
 #include "pcloudcrypto.h"

lib/pclsync/pcompat.c

@@ -34,8 +34,6 @@
 #include <mbedtls/pkcs5.h>
 #include <mbedtls/ssl.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcompat.h"
 #include "plibs.h"
 #include "psettings.h"

lib/pclsync/pcrypto.c

@@ -36,8 +36,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcompat.h"
 #include "pcompiler.h"
 

lib/pclsync/pdiff.c

@@ -39,8 +39,6 @@
 #include <pthread.h>
 #include <stddef.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "paccountevents.h"
 #include "papi.h"
 #include "pbusinessaccount.h"

lib/pclsync/pdownload.c

@@ -37,8 +37,6 @@
 #include <pthread.h>
 #include <stddef.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "papi.h"
 #include "pasyncnet.h"
 #include "pcallbacks.h"

lib/pclsync/pfolder.c

@@ -37,8 +37,6 @@
 #include <pthread.h>
 #include <stddef.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "papi.h"
 #include "pcloudcrypto.h"
 #include "pdiff.h"

lib/pclsync/pfs.c

@@ -38,8 +38,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcloudcrypto.h"
 #include "pcompat.h"
 #include "pfolder.h"

lib/pclsync/pfscrypto.c

@@ -36,8 +36,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcloudcrypto.h"
 #include "pfscrypto.h"
 #include "plibs.h"

lib/pclsync/pfsfolder.c

@@ -36,8 +36,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcloudcrypto.h"
 #include "pfolder.h"
 #include "pfs.h"

lib/pclsync/pfstasks.c

@@ -36,8 +36,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcache.h"
 #include "pcloudcrypto.h"
 #include "pcompat.h"

lib/pclsync/pfsupload.c

@@ -36,8 +36,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcache.h"
 #include "pdiff.h"
 #include "pfileops.h"

lib/pclsync/plocalscan.c

@@ -37,8 +37,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcallbacks.h"
 #include "pfolder.h"
 #include "plibs.h"

lib/pclsync/pmemlock.c

@@ -36,8 +36,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcloudcrypto.h"
 #include "pcompat.h"
 #include "pintervaltree.h"

lib/pclsync/pnetlibs.c

@@ -37,8 +37,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "papi.h"
 #include "pcache.h"
 #include "plibs.h"
@@ -1733,7 +1731,8 @@ err0:
 static int psync_sha1_cmp(const void *p1, const void *p2){
   psync_block_checksum **b1=(psync_block_checksum **)p1;
   psync_block_checksum **b2=(psync_block_checksum **)p2;
-  return memcmp((*b1)->mbedtls_sha1, (*b2)->mbedtls_sha1, PSYNC_SHA1_DIGEST_LEN);
+  return memcmp((*b1)->mbedtls_sha1, (*b2)->mbedtls_sha1,
+PSYNC_SHA1_DIGEST_LEN);
 }
 
 static psync_block_checksum
@@ -1810,7 +1809,8 @@ psync_net_create_hash(const psync_file_checksums *checksums) {
 
 static void psync_net_hash_remove(psync_file_checksum_hash *restrict hash,
                                   psync_file_checksums *restrict checksums,
-                                  uint32_t adler, const unsigned char *mbedtls_sha1) {
+                                  uint32_t adler,
+                                  const unsigned char *mbedtls_sha1) {
   uint32_t idx, zeroidx, o, bp;
   o = adler % hash->elementcnt;
   while (1) {
@@ -1890,10 +1890,9 @@ static int psync_net_hash_has_adler(const psync_file_checksum_hash *hash,
   }
 }
 
-static uint32_t
-psync_net_hash_has_adler_and_sha1(const psync_file_checksum_hash *hash,
-                                  const psync_file_checksums *checksums,
-                                  uint32_t adler, const unsigned char *mbedtls_sha1) {
+static uint32_t psync_net_hash_has_adler_and_sha1(
+    const psync_file_checksum_hash *hash, const psync_file_checksums *checksums,
+    uint32_t adler, const unsigned char *mbedtls_sha1) {
   uint32_t idx, o;
   o = adler % hash->elementcnt;
   while (1) {

lib/pclsync/pp2p.c

@@ -37,8 +37,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "papi.h"
 #include "pcompat.h"
 #include "pcrypto.h"

lib/pclsync/ppagecache.c

@@ -36,8 +36,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcache.h"
 #include "pcrc32c.h"
 #include "pfscrypto.h"

lib/pclsync/ppassword.c

@@ -35,8 +35,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "plibs.h"
 #include "ppassword.h"
 #include "ppassworddict.h"

lib/pclsync/ppathstatus.c

@@ -36,8 +36,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcloudcrypto.h"
 #include "pfolder.h"
 #include "pfs.h"

lib/pclsync/psettings.c

@@ -36,8 +36,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pfs.h"
 #include "plibs.h"
 #include "plocalscan.h"

lib/pclsync/psyncer.c

@@ -37,8 +37,6 @@
 #include <pthread.h>
 #include <stddef.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcallbacks.h"
 #include "pdownload.h"
 #include "pfolder.h"

lib/pclsync/psynclib.c

@@ -38,8 +38,6 @@
 #include <pthread.h>
 #include <stddef.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "papi.h"
 #include "pasyncnet.h"
 #include "pbusinessaccount.h"

lib/pclsync/ptasks.c

@@ -36,8 +36,6 @@
 #include <mbedtls/ssl.h>
 #include <pthread.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "pcallbacks.h"
 #include "pdownload.h"
 #include "plibs.h"

lib/pclsync/pupload.c

@@ -37,8 +37,6 @@
 #include <pthread.h>
 #include <stddef.h>
 
-#include "mbedtls/compat-1.3.h"
-
 #include "papi.h"
 #include "pcallbacks.h"
 #include "pcompat.h"