From bdbc19449148ab6877103bb022a444a4cb5e70e8 Mon Sep 17 00:00:00 2001
From: Dirk Wetter <dirk@testssl.sh>
Date: Fri, 3 May 2019 16:38:44 +0200
Subject: [PATCH] Beautify and simplify the code

---
 t/25_client_sims_starttls.t | 55 +++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/t/25_client_sims_starttls.t b/t/25_client_sims_starttls.t
index fa4cd9d..c00c7e5 100755
--- a/t/25_client_sims_starttls.t
+++ b/t/25_client_sims_starttls.t
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 # Just a functional test, whether there are any problems on the client side
-# Probably we could also inspect the JSON for any problems for 
+# Probably we could also inspect the JSON for any problems for
 #    "id"           : "scanProblem"
 #    "finding"      : "Scan interrupted"
 
@@ -12,59 +12,54 @@ use JSON;
 
 my $tests = 0;
 my $check2run ="--client-simulation -q --ip=one --color 0";
+my $uri="";
+my $socketout="";
+my $opensslout="";
+
+# $check2run="--jsonfile tmp.json $check2run";
+
+
+$uri="google.com";
 
 unlink "tmp.json";
-printf "\n%s\n", "Running socket based client simulations against google.com ...";
-# $tests++;
-my $socketout = `./testssl.sh $check2run --jsonfile tmp.json google.com`;
-my $socket = json('tmp.json');
+printf "\n%s\n", "Client simulations unit test via sockets --> $uri ...";
+$socketout = `./testssl.sh $check2run $uri`;
+# my $socket = json('tmp.json');
 #FIXME: This comparison is maybe not sufficient yet:
 unlike($socketout, qr/(e|E)rror|(f|F)atal/, "");
 $tests++;
 
 
 unlink "tmp.json";
-printf "\n%s\n", "Running OpenSSL based client simulations against google.com ...";
-# $tests++;
-my $opensslout = `./testssl.sh $check2run --ssl-native --jsonfile tmp.json google.com`;
-my $openssl = json('tmp.json');
+printf "\n%s\n", "Client simulations unit test via OpenSSL --> $uri ...";
+$opensslout = `./testssl.sh $check2run --ssl-native $uri`;
+# my $openssl = json('tmp.json');
 #FIXME: This comparison is maybe sufficient yet:
 unlike($opensslout, qr/(e|E)rror|(f|F)atal|Oops|s_client connect problem/, "");
 $tests++;
 
 
+$uri="smtp-relay.gmail.com:587";
+
 unlink "tmp.json";
-printf "\n%s\n", "STARTTLS: Running socket based client simulations against smtp-relay.gmail.com:587 ...";
-# $tests++;
-my $socketout = `./testssl.sh $check2run --jsonfile tmp.json -t smtp smtp-relay.gmail.com:587`;
-my $socket = json('tmp.json');
+printf "\n%s\n", "STARTTLS: Client simulations unit test via sockets --> $uri ...";
+$socketout = `./testssl.sh $check2run -t smtp $uri`;
+# my $socket = json('tmp.json');
 unlike($socketout, qr/(e|E)rror|(f|F)atal/, "");
 $tests++;
 
-
 unlink "tmp.json";
-printf "\n%s\n", "STARTTLS: Running OpenSSL based client simulations against smtp-relay.gmail.com:587 ...";
-# $tests++;
-my $opensslout = `./testssl.sh --ssl-native $check2run --jsonfile tmp.json -t smtp smtp-relay.gmail.com:587`;
-my $openssl = json('tmp.json');
+printf "\n%s\n", "STARTTLS: Client simulations unit test via OpenSSL --> $uri ...";
+$opensslout = `./testssl.sh --ssl-native $check2run -t smtp $uri`;
+# my $openssl = json('tmp.json');
 unlike($opensslout, qr/(e|E)rror|(f|F)atal|Oops|s_client connect problem/, "");
 $tests++;
 
-#my $i = 0;
-#foreach my $o ( @$openssl ) {
-#	my $s = $$socket[$i];
-#	if ( $o->{id} =~ /^client_/ ) {
-#		pass("Comparing $o->{id}"); $tests++;
-#		cmp_ok($o->{id}, "eq", $s->{id}, "Id's match"); $tests++;
-#		cmp_ok($o->{severity}, "eq", $s->{severity}, "Severities match"); $tests++;
-#		cmp_ok($o->{finding}, "eq", $s->{finding}, "Findings match"); $tests++;
-#	}
-#	$i++;
-#}
-
 done_testing($tests);
 unlink "tmp.json";
 
+
+
 sub json($) {
 	my $file = shift;
 	$file = `cat $file`;