diff --git a/basice2e/clients.goldoutput/client100.txt b/basice2e/clients.goldoutput/client100.txt index 7a4a28d63cb1c32df7ae60ab9ca67c19e0b2f675..a6c5a07bdfacb1e3ff2919b291da23bd73db3db9 100644 Binary files a/basice2e/clients.goldoutput/client100.txt and b/basice2e/clients.goldoutput/client100.txt differ diff --git a/basice2e/clients.goldoutput/client101.txt b/basice2e/clients.goldoutput/client101.txt index 6b625f5fd5ebb423f9e4cbd3f727b30001c8c578..3f2d5f80d4f3c90574c3acacd727e1f608b676f8 100644 --- a/basice2e/clients.goldoutput/client101.txt +++ b/basice2e/clients.goldoutput/client101.txt @@ -1,5 +1,5 @@ WARNING: unsafe channel creation enabled -Adding a +Adding Received 0 Sent: Hello from Niamh101, with E2E Encryption Sent: Hello from Niamh101, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client13.txt b/basice2e/clients.goldoutput/client13.txt index 3840a3b7673e4934ba86da4b86b00de84da6fd1f..1599f8861c71b7c654f8ad3947f047edc8a65ade 100644 --- a/basice2e/clients.goldoutput/client13.txt +++ b/basice2e/clients.goldoutput/client13.txt @@ -1,5 +1,5 @@ WARNING: unsafe channel creation enabled -Adding a +Adding Received 0 Received 0 Sent: Hello from Josh13, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt index aaf46d6d595a0d72bcf3df42ccd19d0bb0236f09..36e0ab779c49fe036634098bf4fc1fa3c58efe3a 100644 --- a/basice2e/clients.goldoutput/client18.txt +++ b/basice2e/clients.goldoutput/client18.txt @@ -1,5 +1,5 @@ WARNING: unsafe channel creation enabled -Adding a +Adding Sent: Hi 18->9, with E2E Encryption Sent: Hi 18->9, with E2E Encryption Sent: Hi 18->9, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client31.txt b/basice2e/clients.goldoutput/client31.txt index ab1af97de392783107acd7f7f3ba132b6dd107e2..3e36473d5c023f5b1951542248fc255e7aeaf95f 100644 Binary files a/basice2e/clients.goldoutput/client31.txt and b/basice2e/clients.goldoutput/client31.txt differ diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt index 1e74af66cd5ed71951cd9b6e39301a0a0d15fc60..f3aacc065aa9690908d4ba9c5f8f099884bdeb48 100644 Binary files a/basice2e/clients.goldoutput/client42.txt and b/basice2e/clients.goldoutput/client42.txt differ diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt index 7c573d9eed6f79999f561a7bf3e129c96fbee70f..91bddd4997197eb6642e84306830e92635c57ad7 100644 --- a/basice2e/clients.goldoutput/client43.txt +++ b/basice2e/clients.goldoutput/client43.txt @@ -1,5 +1,5 @@ WARNING: unsafe channel creation enabled -Adding a +Adding Received 0 Received 0 Sent: Hello from Ben43, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt index 6efc1ff1aa8bd3455fb32e3c0eea09842a48f907..018fcbb73b8cd9b7ad335206d7a5028b728ebe8a 100644 --- a/basice2e/clients.goldoutput/client9.txt +++ b/basice2e/clients.goldoutput/client9.txt @@ -1,5 +1,5 @@ WARNING: unsafe channel creation enabled -Adding a +Adding Sent: Hi 9->9, with E2E Encryption Sent: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption @@ -11,7 +11,7 @@ Message received: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption Received 2 WARNING: unsafe channel creation enabled -Adding a +Adding Sent: Hi 9->18, with E2E Encryption Sent: Hi 9->18, with E2E Encryption Sent: Hi 9->18, with E2E Encryption diff --git a/basice2e/run.sh b/basice2e/run.sh index 928105a8a058b06c2912bfd58620f41f597936e5..80b9966a4c483bc3b17b89d10dd2e1318d79ed3a 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -457,7 +457,7 @@ cp $CLIENTOUT/*.txt $CLIENTCLEAN/ sed -i.bak 's/Sending\ to\ .*\:/Sent:/g' $CLIENTCLEAN/client*.txt sed -i.bak 's/Message\ from\ .*, .* Received:/Received:/g' $CLIENTCLEAN/client*.txt sed -i.bak 's/ERROR.*Signature/Signature/g' $CLIENTCLEAN/client*.txt -#sed -i.bak 's/uthenticat.*$//g' $CLIENTCLEAN/client*.txt +sed -i.bak 's/[Aa]uthenticat.*$//g' $CLIENTCLEAN/client*.txt rm $CLIENTCLEAN/client*.txt.bak # for C in $(ls -1 $CLIENTCLEAN); do @@ -470,7 +470,7 @@ set -e echo "TESTS EXITED SUCCESSFULLY, CHECKING OUTPUT..." set +x -diff -ruN clients.goldoutput $CLIENTCLEAN +diff -aruN clients.goldoutput $CLIENTCLEAN if [ "$PERMISSIONING" == "" ] then