diff --git a/basice2e/clients.goldoutput/client18.out b/basice2e/clients.goldoutput/client18.out index 026463950b15ddd1841943e4fc71c741ab1918f9..af0833d42671cd68d58416b3d20e353ee06c6ebc 100644 --- a/basice2e/clients.goldoutput/client18.out +++ b/basice2e/clients.goldoutput/client18.out @@ -1 +1,2 @@ UDB search successful. Returned user [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 9] +Sending Message to 9, Spencer: Hello, 9, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client9.out b/basice2e/clients.goldoutput/client9.out index ce992b4c016272ac345e5e2bf9e6cf1ffd192038..116f612aa0f21d80f1350efb0529477d9d29d192 100644 --- a/basice2e/clients.goldoutput/client9.out +++ b/basice2e/clients.goldoutput/client9.out @@ -1 +1,2 @@ UDB search successful. Returned user [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 18] +Message from 18, Bernardo Received: Hello, 9, with E2E Encryption diff --git a/basice2e/run.sh b/basice2e/run.sh index a0f50b7da5b4c07539f07499504645e7501bded5..654d5dc0e889246b4faea6fd1606cd12f3fb8c08 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -119,13 +119,13 @@ do done # Register two users and then do UDB search on each other -CLIENTCMD="timeout 90s ../bin/client -f blob9 -g $GATEWAY -E "jake@elixxir.io" -i 9 -d 3 -c ../keys/gateway.cmix.rip.crt" +CLIENTCMD="timeout 90s ../bin/client -f blob9 -g $GATEWAY -E "spencer@elixxir.io" -i 9 -d 3 -c ../keys/gateway.cmix.rip.crt" eval $CLIENTCMD >> $CLIENTOUT/client9.out 2>&1 & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" wait $PIDVAL -CLIENTCMD="timeout 90s ../bin/client -f blob18 -g $GATEWAY -E "bernardo@elixxir.io" -i 18 -d 3 -c ../keys/gateway.cmix.rip.crt -m \"SEARCH EMAIL jake@elixxir.io\"" +CLIENTCMD="timeout 90s ../bin/client -f blob18 -g $GATEWAY -E "bernardo@elixxir.io" -i 18 -d 3 -c ../keys/gateway.cmix.rip.crt -m \"SEARCH EMAIL spencer@elixxir.io\"" eval $CLIENTCMD >> $CLIENTOUT/client18.out 2>&1 & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" @@ -137,6 +137,19 @@ PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" wait $PIDVAL +# Send E2E encrypted message between users that discovered each other +CLIENTCMD="timeout 60s ../bin/client -f blob18 -g $GATEWAY -i 18 -d 9 -c ../keys/gateway.cmix.rip.crt -m \"Hello, 9, with E2E Encryption\" --end2end" +eval $CLIENTCMD >> $CLIENTOUT/client18.out 2>&1 & +PIDVAL=$! +echo "$CLIENTCMD -- $PIDVAL" +wait $PIDVAL + +CLIENTCMD="timeout 60s ../bin/client -f blob9 -g $GATEWAY -i 9 -c ../keys/gateway.cmix.rip.crt" +eval $CLIENTCMD >> $CLIENTOUT/client9.out 2>&1 & +PIDVAL=$! +echo "$CLIENTCMD -- $PIDVAL" +wait $PIDVAL + # Send a channel message that all clients will receive CLIENTCMD="timeout 60s ../bin/client -f blob8 -c ../keys/gateway.cmix.rip.crt -g $GATEWAY -i 8 -d 31 -m \"Channel, Hello\"" eval $CLIENTCMD >> $CLIENTOUT/client8.out 2>&1 &