From cb2e5d826556903cd5f306f7c026d3834b5826f3 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Fri, 26 Feb 2021 23:37:37 +0000
Subject: [PATCH] Update golds

---
 basice2e/clients.goldoutput/client18.txt      |   6 +-
 .../clients.goldoutput/client18_rekey.txt     |  40 ++++-----
 basice2e/clients.goldoutput/client35.txt      |  11 +++
 basice2e/clients.goldoutput/client36.txt      |  11 +++
 basice2e/clients.goldoutput/client42.txt      | Bin 1538 -> 1552 bytes
 basice2e/clients.goldoutput/client45.txt      |  80 +++++++++---------
 basice2e/clients.goldoutput/client56.txt      |  80 +++++++++---------
 basice2e/clients.goldoutput/client67.txt      |  80 +++++++++---------
 basice2e/clients.goldoutput/client74.txt      |  80 +++++++++---------
 basice2e/clients.goldoutput/client9.txt       |  14 +--
 basice2e/clients.goldoutput/client9_rekey.txt |  40 ++++-----
 11 files changed, 232 insertions(+), 210 deletions(-)

diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
index f2dbb82..aaf46d6 100644
--- a/basice2e/clients.goldoutput/client18.txt
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -1,8 +1,8 @@
 WARNING: unsafe channel creation enabled
 Adding a
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 18->9, with E2E Encryption
+Sent: Hi 18->9, with E2E Encryption
+Sent: Hi 18->9, with E2E Encryption
+Sent: Hi 18->9, with E2E Encryption
 Message received: Hi 9->18, with E2E Encryption
 Message received: Hi 9->18, with E2E Encryption
 Message received: Hi 9->18, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client18_rekey.txt b/basice2e/clients.goldoutput/client18_rekey.txt
index fb895dc..52a891e 100644
--- a/basice2e/clients.goldoutput/client18_rekey.txt
+++ b/basice2e/clients.goldoutput/client18_rekey.txt
@@ -1,23 +1,23 @@
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
+Sent: Hello, 9, with E2E Encryption
 Message received: Hello, 18, with E2E Encryption
 Message received: Hello, 18, with E2E Encryption
 Message received: Hello, 18, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client35.txt b/basice2e/clients.goldoutput/client35.txt
index 87ef844..917ca25 100644
--- a/basice2e/clients.goldoutput/client35.txt
+++ b/basice2e/clients.goldoutput/client35.txt
@@ -9,3 +9,14 @@ Message received: Hello from 2, without E2E Encryption
 Message received: Hello from 2, without E2E Encryption
 Message received: Hello from 2, without E2E Encryption
 Received 5
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Sent: Hello from 1, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Message received: Hello from 2, without E2E Encryption
+Received 5
diff --git a/basice2e/clients.goldoutput/client36.txt b/basice2e/clients.goldoutput/client36.txt
index 403715d..b5e8425 100644
--- a/basice2e/clients.goldoutput/client36.txt
+++ b/basice2e/clients.goldoutput/client36.txt
@@ -9,3 +9,14 @@ Message received: Hello from 1, without E2E Encryption
 Message received: Hello from 1, without E2E Encryption
 Message received: Hello from 1, without E2E Encryption
 Received 5
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Sent: Hello from 2, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Message received: Hello from 1, without E2E Encryption
+Received 5
diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt
index 012f3b4774f902e91f8ccea31d9041c7d0ee8f3a..1e74af66cd5ed71951cd9b6e39301a0a0d15fc60 100644
GIT binary patch
delta 22
ecmZqTnZUE*2h+rG&B^y!9!zZD-28``jR^p3^$8FF

delta 20
ccmbQh)5Npk2h(Ib=EIZEvN~_(VPRnc08;k`-2eap

diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index bf2db33..16063ec 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,23 +1,23 @@
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
 Message received: Hello, 4
 Message received: Hello, 4
 Message received: Hello, 4
@@ -39,26 +39,26 @@ Message received: Hello, 4
 Message received: Hello, 4
 Message received: Hello, 4
 Received 20
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
-Sending to AAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
+Sent: Hello, 5
 Message received: Hello, 4
 Message received: Hello, 4
 Message received: Hello, 4
diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt
index 010ac2e..ce4bf8e 100644
--- a/basice2e/clients.goldoutput/client56.txt
+++ b/basice2e/clients.goldoutput/client56.txt
@@ -1,23 +1,23 @@
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
 Message received: Hello, 5
 Message received: Hello, 5
 Message received: Hello, 5
@@ -39,26 +39,26 @@ Message received: Hello, 5
 Message received: Hello, 5
 Message received: Hello, 5
 Received 20
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
-Sending to AAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
+Sent: Hello, 6
 Message received: Hello, 5
 Message received: Hello, 5
 Message received: Hello, 5
diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt
index 0f8eb45..6e6f041 100644
--- a/basice2e/clients.goldoutput/client67.txt
+++ b/basice2e/clients.goldoutput/client67.txt
@@ -1,23 +1,23 @@
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
 Message received: Hello, 6
 Message received: Hello, 6
 Message received: Hello, 6
@@ -39,26 +39,26 @@ Message received: Hello, 6
 Message received: Hello, 6
 Message received: Hello, 6
 Received 20
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
-Sending to AAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
+Sent: Hello, 7
 Message received: Hello, 6
 Message received: Hello, 6
 Message received: Hello, 6
diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt
index 7f5416d..767b3dc 100644
--- a/basice2e/clients.goldoutput/client74.txt
+++ b/basice2e/clients.goldoutput/client74.txt
@@ -1,23 +1,23 @@
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
 Message received: Hello, 7
 Message received: Hello, 7
 Message received: Hello, 7
@@ -39,26 +39,26 @@ Message received: Hello, 7
 Message received: Hello, 7
 Message received: Hello, 7
 Received 20
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
-Sending to AAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
+Sent: Hello, 4
 Message received: Hello, 7
 Message received: Hello, 7
 Message received: Hello, 7
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
index ac3d28f..6efc1ff 100644
--- a/basice2e/clients.goldoutput/client9.txt
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -1,20 +1,20 @@
 WARNING: unsafe channel creation enabled
 Adding a
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
+Sent: Hi 9->9, with E2E Encryption
+Sent: Hi 9->9, with E2E Encryption
 Message received: Hi 9->9, with E2E Encryption
 Message received: Hi 9->9, with E2E Encryption
 Received 2
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
-Sending to AAAAAAAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->9, with E2E Encryption
+Sent: Hi 9->9, with E2E Encryption
+Sent: Hi 9->9, with E2E Encryption
 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
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hi 9->18, with E2E Encryption
+Sent: Hi 9->18, with E2E Encryption
+Sent: Hi 9->18, with E2E Encryption
+Sent: Hi 9->18, with E2E Encryption
 Message received: Hi 18->9, with E2E Encryption
 Message received: Hi 18->9, with E2E Encryption
 Message received: Hi 18->9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client9_rekey.txt b/basice2e/clients.goldoutput/client9_rekey.txt
index 62a6668..898db88 100644
--- a/basice2e/clients.goldoutput/client9_rekey.txt
+++ b/basice2e/clients.goldoutput/client9_rekey.txt
@@ -1,23 +1,23 @@
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
-Sending to AAAAAAAAABIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
+Sent: Hello, 18, with E2E Encryption
 Message received: Hello, 9, with E2E Encryption
 Message received: Hello, 9, with E2E Encryption
 Message received: Hello, 9, with E2E Encryption
-- 
GitLab