From e10e15743741e4224c9708ac421df0cf02ccce54 Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Fri, 7 Feb 2020 05:15:25 +0000
Subject: [PATCH] More hackery to get around the new client changes, which of
course break integration...
---
basice2e/clients.goldoutput/client18.txt | 2 +-
basice2e/clients.goldoutput/client42.txt | 2 +-
basice2e/clients.goldoutput/client43.txt | 2 +-
basice2e/clients.goldoutput/client45.txt | 2 +-
basice2e/clients.goldoutput/client56.txt | 2 +-
basice2e/clients.goldoutput/client67.txt | 2 +-
basice2e/clients.goldoutput/client74.txt | 2 +-
basice2e/clients.goldoutput/client9.txt | 2 +-
basice2e/run.sh | 5 +++++
9 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
index 8a61914..9be1b32 100644
--- a/basice2e/clients.goldoutput/client18.txt
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -1,3 +1,3 @@
Message from 9, Spencer Received: Hello, 18, with E2E Encryption
Received: Hello, 18, with E2E Encryption
-Sending Message to 9, Spencer: Hello, 9, with E2E Encryption
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAk=, Spencer: Hello, 9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt
index e703c23..f24f5d7 100644
--- a/basice2e/clients.goldoutput/client42.txt
+++ b/basice2e/clients.goldoutput/client42.txt
@@ -1,2 +1,2 @@
+ Hello from Rick42, with E2E Encryption
Received: Hello from Ben43, with E2E Encryption
-Sending Message to 0, : Hello from Rick42, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt
index 2f39f09..0463ff2 100644
--- a/basice2e/clients.goldoutput/client43.txt
+++ b/basice2e/clients.goldoutput/client43.txt
@@ -1,2 +1,2 @@
+ Hello from Ben43, with E2E Encryption
Received: Hello from Rick42, with E2E Encryption
-Sending Message to 0, : Hello from Ben43, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index b7b5025..bbbbb13 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,3 +1,3 @@
Message from 7, Rick Received: Hello, 4
Received: Hello, 4
-Sending Message to 5, Ben: Hello, 5
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=, Ben: Hello, 5
diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt
index 78d8019..356b9a4 100644
--- a/basice2e/clients.goldoutput/client56.txt
+++ b/basice2e/clients.goldoutput/client56.txt
@@ -1,3 +1,3 @@
Message from 4, Jim Received: Hello, 5
Received: Hello, 5
-Sending Message to 6, Steph: Hello, 6
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY=, Steph: Hello, 6
diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt
index 4139df1..5c9fdd1 100644
--- a/basice2e/clients.goldoutput/client67.txt
+++ b/basice2e/clients.goldoutput/client67.txt
@@ -1,3 +1,3 @@
Message from 5, Ben Received: Hello, 6
Received: Hello, 6
-Sending Message to 7, Rick: Hello, 7
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAc=, Rick: Hello, 7
diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt
index 634534e..c293c40 100644
--- a/basice2e/clients.goldoutput/client74.txt
+++ b/basice2e/clients.goldoutput/client74.txt
@@ -1,3 +1,3 @@
Message from 6, Steph Received: Hello, 7
Received: Hello, 7
-Sending Message to 4, Jim: Hello, 4
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=, Jim: Hello, 4
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
index 5532a37..1314bc6 100644
--- a/basice2e/clients.goldoutput/client9.txt
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -1,3 +1,3 @@
Message from 18, Bernardo Received: Hello, 9, with E2E Encryption
Received: Hello, 9, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABI=, Bernardo: Hello, 18, with E2E Encryption
diff --git a/basice2e/run.sh b/basice2e/run.sh
index c6df138..abfa2b5 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -215,8 +215,13 @@ rm $CLIENTCLEAN/client9_rekey.txt $CLIENTCLEAN/client18_rekey.txt || true
strings $CLIENTCLEAN/client42.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client42-clean.txt || true
strings $CLIENTCLEAN/client43.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client43-clean.txt || true
+strings $CLIENTCLEAN/client74.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client74-clean.txt || true
mv $CLIENTCLEAN/client42-clean.txt $CLIENTCLEAN/client42.txt
mv $CLIENTCLEAN/client43-clean.txt $CLIENTCLEAN/client43.txt
+mv $CLIENTCLEAN/client74-clean.txt $CLIENTCLEAN/client74.txt
+
+sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client42.txt
+sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client43.txt
for C in $(ls -1 $CLIENTCLEAN); do
sort -o tmp $CLIENTCLEAN/$C || true
--
GitLab