|
@@ -23,7 +23,7 @@ discard block |
|
|
block discarded – undo |
|
23
|
23
|
|
|
24
|
24
|
use \Exception; |
|
25
|
25
|
|
|
26
|
|
-require_once dirname(dirname(__DIR__)) . "/config/_config.php"; |
|
|
26
|
+require_once dirname(dirname(__DIR__))."/config/_config.php"; |
|
27
|
27
|
|
|
28
|
28
|
/** |
|
29
|
29
|
* Test suite to verify that a given NAI realm has NAPTR records according to |
|
@@ -144,7 +144,7 @@ discard block |
|
|
block discarded – undo |
|
144
|
144
|
$this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['status'] = $cert['status']; |
|
145
|
145
|
$this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['message'] = $this->TLS_certkeys[$cert['status']]; |
|
146
|
146
|
$this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k]['expected'] = $cert['expected']; |
|
147
|
|
- $add = ' -cert ' . ROOT . '/config/cli-certs/' . $cert['public'] . ' -key ' . ROOT . '/config/cli-certs/' . $cert['private']; |
|
|
147
|
+ $add = ' -cert '.ROOT.'/config/cli-certs/'.$cert['public'].' -key '.ROOT.'/config/cli-certs/'.$cert['private']; |
|
148
|
148
|
if (!isset($this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k])) { |
|
149
|
149
|
$this->TLS_clients_checks_result[$host]['ca'][$type]['certificate'][$k] = []; |
|
150
|
150
|
} |
|
@@ -188,11 +188,11 @@ discard block |
|
|
block discarded – undo |
|
188
|
188
|
// but code analysers want this more explicit, so here is this extra |
|
189
|
189
|
// call to escapeshellarg() |
|
190
|
190
|
$escapedHost = escapeshellarg($host); |
|
191
|
|
- $this->loggerInstance->debug(4, CONFIG['PATHS']['openssl'] . " s_client -connect " . $escapedHost . " -tls1 -CApath " . ROOT . "/config/ca-certs/ $arg 2>&1\n"); |
|
|
191
|
+ $this->loggerInstance->debug(4, CONFIG['PATHS']['openssl']." s_client -connect ".$escapedHost." -tls1 -CApath ".ROOT."/config/ca-certs/ $arg 2>&1\n"); |
|
192
|
192
|
$time_start = microtime(true); |
|
193
|
193
|
$opensslbabble = []; |
|
194
|
194
|
$result = 999; // likely to become zero by openssl; don't want to initialise to zero, could cover up exec failures |
|
195
|
|
- exec(CONFIG['PATHS']['openssl'] . " s_client -connect " . $escapedHost . " -no_ssl2 -no_ssl3 -CApath " . ROOT . "/config/ca-certs/ $arg 2>&1", $opensslbabble, $result); |
|
|
195
|
+ exec(CONFIG['PATHS']['openssl']." s_client -connect ".$escapedHost." -no_ssl2 -no_ssl3 -CApath ".ROOT."/config/ca-certs/ $arg 2>&1", $opensslbabble, $result); |
|
196
|
196
|
$time_stop = microtime(true); |
|
197
|
197
|
$testresults['time_millisec'] = floor(($time_stop - $time_start) * 1000); |
|
198
|
198
|
$testresults['returncode'] = $result; |
GEANT /
CAT
