Merge branch 'develop' into 'release'

Test for session file encryption

See merge request !52

basice2e/clients.goldoutput/client18.txt

-Received: Hello, 18, with E2E Encryption
+Message from 9, Spencer Received: Hello, 18, with E2E Encryption
 Sending Message to 9, Spencer: Hello, 9, with E2E Encryption

basice2e/clients.goldoutput/client9.txt

-Received: Hello, 9, with E2E Encryption
+Message from 18, Bernardo Received: Hello, 9, with E2E Encryption
 Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption

basice2e/run.sh

@@ -16,7 +16,7 @@ DUMMYOUT=results/dummy-console.txt
 UDBOUT=results/udb-console.txt
 CLIENTCLEAN=results/clients-cleaned
 
-CLIENTOPTS="-n ndf.json --skipNDFVerification --noTLS"
+CLIENTOPTS="-n ndf.json --skipNDFVerification -P dummypassword --noTLS"
 
 mkdir -p $SERVERLOGS
 mkdir -p $GATEWAYLOGS
@@ -142,12 +142,12 @@ echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
 
 # Send multiple E2E encrypted messages between users that discovered each other
-CLIENTCMD="timeout 60s ../bin/client $CLIENTOPTS -i 18 -d 9 -f blob18 -m \"Hello, 9, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 60s ../bin/client $CLIENTOPTS -c 20 -w 20 -i 18 -d 9 -f blob18 -m \"Hello, 9, with E2E Encryption\" --end2end"
 eval $CLIENTCMD >> $CLIENTOUT/client18_rekey.txt 2>&1 || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
 
-CLIENTCMD="timeout 60s ../bin/client $CLIENTOPTS -i 9 -d 18 -f blob9 -m \"Hello, 18, with E2E Encryption\" --end2end"
+CLIENTCMD="timeout 60s ../bin/client $CLIENTOPTS -c 20 -w 20 -i 9 -d 18 -f blob9 -m \"Hello, 18, with E2E Encryption\" --end2end"
 eval $CLIENTCMD >> $CLIENTOUT/client9_rekey.txt 2>&1 || true &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"