From 661bdfb6757a1d3a89f0e37d1916db2587ee3f3d Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Mon, 14 Oct 2019 17:17:35 +0000
Subject: [PATCH] Remove pregenerated private keys

---
 basice2e/ben43-priv.pem  | 27 ---------------------------
 basice2e/rick42-priv.pem | 27 ---------------------------
 basice2e/run.sh          |  7 +++++--
 3 files changed, 5 insertions(+), 56 deletions(-)
 delete mode 100644 basice2e/ben43-priv.pem
 delete mode 100644 basice2e/rick42-priv.pem

diff --git a/basice2e/ben43-priv.pem b/basice2e/ben43-priv.pem
deleted file mode 100644
index 8c91fb0..0000000
--- a/basice2e/ben43-priv.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA3iRh98wMYhu8ITCe/MR/oUfPlSFPM8uEYP9gKI1AeK1GEIjF
-UVNkHIwM1R9AIgyTY7fv27VvxB8HEEgb7BNpNdTXZ71PKI3xjtwh1OL/Prb/mgXA
-z72yxOo2EYOH6xiw3NpXTT/F4Qq5NWNCuRdBoULmZX4SjDpprwacHm7bJ91cblon
-uvGTIH81oTVz42izGxc94hI7EkZSP0f2eBTE9Gr+bm3dErlvhQRLu/PZVbERNtob
-hco2dDiirCsGGBDeZUXI0jOn7lgxVXKUJw67QKw+o1PEHCoQ7KZ2Am/HKoeoc2Zq
-xl5ob5gC0BwStwKR0NSU4eqcnWhtXoeI5Ku3DQIDAQABAoIBAB3KeUz3E24Q1CEL
-WTcCzy7852zTg8CpeX5coTOvBcdpTW0oOnYWneVqLspiH4Kxdw63ezZW1b9SfesE
-EKKPU9vBSIYEEFqa9ps3EF5xdtOdTRgFz37MrO3Vjxy4LAEuVYG40l5swAfXHVF4
-l1klMksDIszXpHsj1kp/s24tZbyppiMtd4X8oiHVGPqi6ujxAv0LVBFwnxwNSvmv
-92xJxSZSJPKnmolE0q531Ey91+FltegwEgr/imE9bVgblAZC4m+H5gA0Sw6RNJbU
-2DiwRjvd3nQXoDMtFP14tCmp8J+oqcERS3Zo9dY6qSPv0OPAGl9K5pv1YEhLsnjN
-sQi6OU0CgYEA8y9MkWPBebgTvmUiM5tNSQi5iwkleboYmuKV336CpoCNtTG7o06W
-l2vD4/kvtfCxNnkcz/FYJYdI4sGo7mfV/rsgHyw4A9vNAyCIm3IMDx1INtTuTMHX
-5dJdYqGMuwaX26lZUfuHDdCvzeL9c0hGeg2hkfVn0pzXdQHsVAFq63MCgYEA6dk0
-1JoAWynvXBiDhWAymgr1XH3aTTks5l/I7B8F27CsdfuFtqr1q0rXLNHSIWCzVABL
-x4O9FkqWIxQ4g1j/DhTcIT39aPooDkDBkgSK7qky2rBsCl05ucgCe1K6YJeXy1c6
-1yXhgyGdsDRssGW0moDlxMUwf1RO1CvIvMEjM38CgYEAsXVCmpYBCaGaRsXmP2KE
-81a6jwsNndZ/Pgc69uyKypXk0uSH2JPwsG6jdCjS+CG8L9QRgmzLthcSyOYpME/1
-iP1kY1sRRT+QS0fiaAzBYAYuPFUF0F1j/wGTw/W/jHszNchOtdSmqR4wLD4IVafY
-RhjMXoaGTNrHH0tX+bVPIKECgYBpfISbXrjIZttFhP1XHfTVjhnuVgsyiJcbeJvO
-/5OJ7WFuez5vDyFw2nrECgYq7k8WlmeYoXGba5vcSRPRFEVBmeFO0YLNZwLIoydu
-ccQmMobxJWInLrSKfJG6BbBzQA7GOBwfz0Ox/mj+gjeBPu/APmLnZzggR+yjQvjz
-RIBXiwKBgFuanyA04QXDE7kyqpLWVsg1NC7L48XSasw0/r+vGM+DHhqxFqhTwXW1
-Rk7I/fd/AwEnq908Xb6I+9e7UTQ/LXcxbN6Bvgy4LZQcvb6TeyKA+Xr32BOzczG2
-9GxgrfQGmFjlZKV3c7nLRF02s3F9LBlNVeMo5oPYB8uSLQjt37QI
------END RSA PRIVATE KEY-----
diff --git a/basice2e/rick42-priv.pem b/basice2e/rick42-priv.pem
deleted file mode 100644
index 2f940d1..0000000
--- a/basice2e/rick42-priv.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEApzt/NZn5TaMwdi+ctQGYkltAnANZqBLTT0KLixaaqWEX+TjO
-No5sj1HVWqi6Zcn5KRMDLAjj0Oke+miamZhI3akkk7iBomiKE5QR5GaTspfCLiqw
-m95noqDv/4efvCeJK0dzF7Q2BOU5FZkL6S4AveAJgdEzsiLzskjLF7n8oU6D2nMq
-k9qbnXnvR7DPGQyGjIck1cLidoW+lLYE5mZgRKsRFXrZhQ95TD1woLOdkmNR0vRd
-PCGNBiCYtj4ZFaBSNgArnEwrmxizIpGrzT38GAOFQc+LN+E9nZf35xN8H7H+F2pf
-1GXJUcJYcPBZnX147GybQHcYNLbpVfIsOqeN6QIDAQABAoIBAGUIcwBFN/MJxnuA
-pGJOxoiVjOE0vPPn+7YE9B1h2KrAOCWfhiY7waaMwCN3kLVyYo/IJsBx1oEedlK+
-47gr4snYKHr+m4MtOU4+xNiCiHT7bptJu01P/rioFpcAryaTlDGLhyMpAwHOIsDD
-qAiGfHg6ZEQDygGzUBvEEr8Q5Gnm9XVRdp906v9u78Er8is2m0zzPUI6PWBSSBp7
-9X0QxCLEGEtBuOSPX4jxdSzb5OP3b5V2D8Et9fcWTW9yvv44Bf/10ccI5Wcdkx0P
-UzQni8acwtFNMpCF3e8mWPgUss0KLMQYkaKuyhonJNc9Z8eDKqDuYV82p/JZPDM5
-0YpF/ykCgYEA1GFo1P14Jz32bJ0AAWvtcOFaUNS4hdjGY7dqq1c2udqs/kRJYS5H
-oswpP67TqsfrOZXkR/YGveU4cZVxzvufy6kM0Fw/zVwQ/FfaiYQ8OwzYgYIPrvBw
-zobPo1XpMmsQZblH77EYG+aBvWrwl02rhc1niQXgFj4tdQGWt8Ze68MCgYEAyZRH
-0qO+275GPAXLEjED4wuww6zjGuVc62RfsN1QqzBN/qYKovVkxV1GQp6rD6rTARlF
-ezc/oUEueDi7imcG5jdSLtoHgM+2KwbbFMMwfPJWKDBazbhkEZbnUBcOuchOaOHl
-NdXyKGo5BXvkRgYKjILUYhGs2p6itKI3WIxJgOMCgYEAj4Rv8haDHomZv9Xsjglf
-//rZLGxDcXeGwRXOSJD8E2X5py2AJOLAV/v9F+LNeMf2ZgirphFUhviiRudFbCjP
-2DGZzie4mc7QT6YSsQEiLolEuWepr38dzAJ/yBGjL4X4I7WsLgaPkzMWk2jzwlsj
-QJ0IjSjiQEWuNDZpojC0Lj8CgYBfOh1z9McFKC4lzNbSETW03KD0z4e5/QCYcyKB
-ewvQ01EFK4t60FJ6qkW20x4cmKZ1rmqUetUkaJZ7VNHD4EfyGdBJMda5k2aLjQGS
-HWOaoyDwe2dqJ+GeLZu4yiu6uFXSVmThueBcF1I4tP5x1gjFuEh8y7zMyoQysS9U
-NXHD4QKBgQCQMCNaBbQUR1sb6stXtvJOPxs+v5FfenSvMi0c+CNSZgOsKKplpJHZ
-is9t7Fq/4XUyBQdTfDHxn4Nbsw/6Ry8azPdSRyr/pVfsxoE96WgjuwfMYZCAKV0e
-X2H20BzQRX/Ci5dz5uOt9w3qFRxsRfHn1KlOARlHwOpqcZgm4a7NNQ==
------END RSA PRIVATE KEY-----
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 5e69d8c..058c982 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -157,11 +157,11 @@ wait $PIDVAL || true
 
 # Register non-precanned users
 echo "REGISTERING NEW USERS..."
-CLIENTCMD="timeout 60s ../bin/client  $CLIENTOPTS -f blob42 -E rick42@elixxir.io --privateKey rick42-priv.pem"
+CLIENTCMD="timeout 60s ../bin/client  $CLIENTOPTS -f blob42 -E rick42@elixxir.io"
 eval $CLIENTCMD >> $CLIENTOUT/client42.txt 2>&1 &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 60s ../bin/client  $CLIENTOPTS -f blob43 -E ben43@elixxir.io --privateKey ben43-priv.pem"
+CLIENTCMD="timeout 60s ../bin/client  $CLIENTOPTS -f blob43 -E ben43@elixxir.io"
 eval $CLIENTCMD >> $CLIENTOUT/client43.txt 2>&1 &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
@@ -181,6 +181,8 @@ echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
 wait $PIDVAL2
 
+# Extract generated user name from logs
+echo "EXTRACTING USER IDs FROM LOG FILES..."
 TMPID=$(cat $CLIENTOUT/client42.txt | grep "Successfully registered user" | awk -F' ' '{print $8}')
 RICKID=${TMPID%?} # remove ! from end
 TMPID=$(cat $CLIENTOUT/client43.txt | grep "Successfully registered user" | awk -F' ' '{print $8}')
@@ -229,6 +231,7 @@ set -e
 
 
 echo "TESTS EXITED SUCCESSFULLY, CHECKING OUTPUT..."
+set +x
 diff -ruN clients.goldoutput $CLIENTCLEAN
 
 cat $CLIENTOUT/* | strings | grep -e "ERROR" -e "FATAL" > results/client-errors || true
-- 
GitLab