summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymii <RaymiiOrg@users.noreply.github.com>2015-04-07 08:10:24 +0200
committerRaymii <RaymiiOrg@users.noreply.github.com>2015-04-07 08:10:24 +0200
commitced7bdc15c7086cc47452478e6d94429833d30b7 (patch)
treeec1667971265e07ad37b489451ab83109d7660c6
parent735c2a72b293655b74293ef999374582f948bd8b (diff)
parent8bad9fd52277bb964cbfebeef5a6723e5528bd9d (diff)
downloadssl-decoder-ced7bdc15c7086cc47452478e6d94429833d30b7.zip
ssl-decoder-ced7bdc15c7086cc47452478e6d94429833d30b7.tar.gz
ssl-decoder-ced7bdc15c7086cc47452478e6d94429833d30b7.tar.bz2
Merge pull request #18 from djlarsu/master
Typo, and fix for json.php use of php short tag
-rw-r--r--functions/connection.php6
-rw-r--r--json.php2
2 files changed, 4 insertions, 4 deletions
diff --git a/functions/connection.php b/functions/connection.php
index a1e718e..e9542f9 100644
--- a/functions/connection.php
+++ b/functions/connection.php
@@ -174,7 +174,7 @@ function ssl_conn_metadata($data) {
echo "</i><br>";
}
if (isset($value["error"])) {
- echo "<span class='text-danger glyphicon glyphicon-remove'></span> - <span class='text-danger'>Error: Issuer does not match the next certificate CN. Chain order is probaby wrong.</span><br><br>";
+ echo "<span class='text-danger glyphicon glyphicon-remove'></span> - <span class='text-danger'>Error: Issuer does not match the next certificate CN. Chain order is probably wrong.</span><br><br>";
}
}
echo "<br>";
@@ -435,8 +435,8 @@ function ssl_conn_metadata_json($host, $port, $read_stream, $chain_data=null) {
continue;
} else {
if ($i != $chain_length - 1) {
- $result["chain"][$i]["error"] = "Issuer does not match the next certificate CN. Chain order is probaby wrong.";
- $result["warning"][] = "Issuer does not match the next certificate CN. Chain order is probaby wrong.";
+ $result["chain"][$i]["error"] = "Issuer does not match the next certificate CN. Chain order is probably wrong.";
+ $result["warning"][] = "Issuer does not match the next certificate CN. Chain order is probably wrong.";
}
}
}
diff --git a/json.php b/json.php
index 0b9fbca..1ddc929 100644
--- a/json.php
+++ b/json.php
@@ -62,7 +62,7 @@ if ($_GET["type"] == "pretty") {
</script>
<noscript><p><img src="//hosted-oswa.org/piwik/piwik.php?idsite=34" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
- <?
+ <?php
} else {
header('Content-Type: application/json');
echo json_encode($data);