Use json endpoint internally and add warnings

1 files changed, 665 insertions, 630 deletions

diff --git a/functions/parse_certificate.php b/functions/parse_certificate.php
index 1c7c959..e926e47 100644
--- a/functions/parse_certificate.php
+++ b/functions/parse_certificate.php
@@ -14,653 +14,636 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-function get_cert_cn($raw_cert_data){
-  $cert_data = openssl_x509_parse($raw_cert_data);
-  if ($cert_data['subject']['CN']) {
-    return $cert_data['subject']['CN'];
+
+function csr_parse($data) {
+  echo "<table class='table table-striped table-bordered'>";
+  echo "<tr>";
+  echo "<td colspan='2'><strong>Certificate Data</strong></td>";
+  echo "</tr>";
+  foreach ($data['subject'] as $key => $value) {
+    echo "<tr><td>";
+    switch ($key) {
+      case 'C':
+      echo "Country";
+      break;
+      case 'ST':
+      echo "State";
+      break;
+      case 'L':
+      echo "City";
+      break;
+      case 'O':
+      echo "Organization";
+      break;
+      case 'OU':
+      echo "Organizational Unit";
+      break;
+      case 'CN':
+      echo "Common Name";
+      break;
+      case 'mail':
+      echo "Email Address";
+      break;
+      default:
+      echo htmlspecialchars($key);
+      break;
+    }
+    echo "</td><td>";
+    switch ($key) {
+      case 'C':
+      echo htmlspecialchars($value);
+      echo ' <img src="'.htmlspecialchars($current_folder) . 'img/blank.gif" class="flag flag-';
+      echo strtolower(htmlspecialchars($value)); 
+      echo '" alt="" />';
+      break;
+      case 'DC':
+      foreach ($value as $key => $value) {
+        echo htmlspecialchars($value) . ".";
+      }
+      break;
+      default:
+      if (is_array($value)) {
+        foreach ($value as $key => $value) {
+          echo htmlspecialchars($value) . " ";
+        }
+      } else {
+        echo htmlspecialchars($value);
+      }
+      break;
+    }
+    echo "</td></tr>\n";
+  }
+  echo "<tr><td>Public Key PEM (";
+  echo htmlspecialchars($data['details']['bits']);
+  if ($data['details']['rsa']) {
+    echo " RSA";
+  }
+  if ($data['details']['dsa']) {
+    echo " DSA";
+  }
+  if ($data['details']['dh']) {
+    echo " DH";
   }
+  if ($data['details']['ec']) {
+    echo " ECDSA";
+  }
+  echo ")</td><td><pre>";
+  echo htmlspecialchars($data['details']['key']);
+  echo "</pre></td>";
+  echo "</table>";
 }
 
-function cert_parse($raw_cert_data, $raw_next_cert_data=null, $csr=false, $host=null, $port=null, $is_issuer=false) {
-  global $random_blurp;
-  global $ev_oids;
 
-  if ($csr == true && strpos($raw_cert_data, "BEGIN CERTIFICATE REQUEST") !== false) { 
-    ?>
-    <table class="table table-striped table-bordered">
-      <tr>
-        <td colspan="2"><strong>Certificate Data</strong></td>
-      </tr>
-      <?php
-      $cert_data = openssl_csr_get_public_key($raw_cert_data);
-
-      $cert_details = openssl_pkey_get_details($cert_data);
-      $cert_key = $cert_details['key'];
-      $cert_subject = openssl_csr_get_subject($raw_cert_data);
-
-      foreach ($cert_subject as $key => $value) {
-        echo "<tr><td>";
-        switch ($key) {
-          case 'C':
-          echo "Country";
-          break;
-          case 'ST':
-          echo "State";
-          break;
-          case 'L':
-          echo "City";
-          break;
-          case 'O':
-          echo "Organization";
-          break;
-          case 'OU':
-          echo "Organizational Unit";
-          break;
-          case 'CN':
-          echo "Common Name";
-          break;
-          case 'mail':
-          echo "Email Address";
-          break;
-          default:
-          echo htmlspecialchars($key);
-          break;
+function cert_parse($data) {
+  if (is_array($data["warning"]) && count($data["warning"]) >= 1) {
+    $data["warning"] = array_unique($data["warning"]);
+    if (count($data["warning"]) == 1) {
+      echo "<h3>" . count($data["warning"]) . " warning!</h3>";
+    } else {
+      echo "<h3>" . count($data["warning"]) . " warnings!</h3>";
+    }
+    foreach ($data["warning"] as $key => $value) {
+      echo "<div class='alert alert-danger' role='alert'>";
+      echo htmlspecialchars($value);
+      echo "</div>";
+    }
+  }
+  echo "<table class='table table-striped table-bordered'>";
+  echo "<tr>";
+  echo "<td colspan='2'><strong>Certificate Data</strong></td>";
+  echo "</tr>";
+  $today = date("Y-m-d");
+  echo "<tr><td colspan='2'>\n";
+  echo "<table class='table'>\n";
+  echo "<thead><tr>\n";
+  echo "<th>Hostname</th>\n";
+  echo "<th>Not Expired</th>\n";
+  echo "<th>Issuer</th>\n";
+  echo "<th>CRL</th>\n";
+  echo "<th>OCSP</th>\n";
+  echo "<th>Signing Type</th>\n";
+  echo "</tr>\n</thead>\n<tbody>\n<tr>";
+  // hostname validation
+  if ($data["hostname_in_san_or_cn"] == "true") {
+    echo '<td><h1><span class="text-success glyphicon glyphicon-ok"></span>&nbsp;</h1></td>';
+  } elseif ($data["hostname_in_san_or_cn"] == "false")  {
+    echo '<td><h1><span class="text-danger glyphicon glyphicon-remove"></span>&nbsp;</h1></td>';
+  } elseif ($data["hostname_in_san_or_cn"] == "n/a; ca signing certificate")  {
+    echo "<td></td>";
+  } else {
+    echo "<td><h1><span class='text-danger glyphicon glyphicon-question-sign'></span>&nbsp;</h1></td>";
+  }
+  // expired
+  if ( $today > date(DATE_RFC2822,$data['cert_data']['validFrom_time_t']) || strtotime($today) < strtotime(date(DATE_RFC2822,$data['cert_data']['validTo_time_t'])) ) {
+    echo '<td><h1><span class="text-success glyphicon glyphicon-ok"></span>&nbsp;</h1></td>';
+  } else {
+    echo '<td><h1><span class="text-danger glyphicon glyphicon-remove"></span>&nbsp;</h1></td>';
+  }
+  // issuer
+  if (!empty($data["issuer_valid"])) {
+    if ($data["issuer_valid"] == true) {
+      echo '<td><h1><span class="text-success glyphicon glyphicon-ok"></span>&nbsp;</h1></td>';
+    } else {
+      echo '<td><h1><span class="text-danger glyphicon glyphicon-remove"></span>&nbsp;</h1></td>';
+    }
+  } else {
+    echo '<td> </td>';
+  }
+  // crl
+  if ( !empty($data['crl'][1]['status']) ) {
+    if ($data['crl'][1]['status'] == "ok") {
+      echo "<td><h1><span class='text-success glyphicon glyphicon-ok'></span>&nbsp;</h1></td>";
+    } else {
+      echo '<td><h1><span class="text-danger glyphicon glyphicon-remove"></span>&nbsp;</h1></td>';
+    }
+  } else {
+    echo '<td> </td>';
+  }
+  // ocsp
+  if (!empty($data['ocsp'][1]['ocsp_uri'])) {
+    echo "<td>";
+    if ($data['ocsp'][1]["status"] == "good") { 
+      echo '<h1><span class="text-success glyphicon glyphicon-ok"></span>&nbsp;</h1>';
+    } else if ($data['ocsp'][1]["status"] == "revoked") {
+      echo '<h1><span class="text-danger glyphicon glyphicon-remove"></span>&nbsp;</h1>';
+    } else {
+      echo '<h1><span class="text-danger glyphicon glyphicon-question-sign"></span>&nbsp;</h1>';
+    }
+    echo "</td>";
+  } else {
+    echo "<td> </td>";
+  }
+  // self signed/ca/ca root
+  if (strpos($data['cert_data']['extensions']['basicConstraints'], "CA:TRUE") !== false && $data['cert_data']['issuer']['CN'] == $data['cert_data']['subject']['CN'] ) {
+    echo '<td><span class="text-success">CA Root Certificate</span></td>';
+  } else if (strpos($data['cert_data']['extensions']['basicConstraints'], "CA:TRUE") !== false) {
+    echo '<td><span class="text-success">CA Certificate</span></td>';
+  } else if ($data['cert_data']['issuer']['CN'] == $data['cert_data']['subject']['CN']) {
+    echo '<td><span class="text-danger">Self Signed</span></td>';
+  } else {
+    echo "<td>Signed by CA</td>";
+  }
+  echo "</tr>";
+  echo "</tbody></table>";
+  echo "</td></tr>";
+  if (!empty($data['cert_data']['subject']) ) {
+    foreach ($data['cert_data']['subject'] as $key => $value) {
+      echo "<tr><td>";
+      switch ($key) {
+        case 'C':
+        echo "Country";
+        break;
+        case 'ST':
+        echo "State";
+        break;
+        case 'L':
+        echo "City";
+        break;
+        case 'O':
+        echo "Organization";
+        break;
+        case 'OU':
+        echo "Organizational Unit";
+        break;
+        case 'CN':
+        echo "Common Name";
+        break;
+        case 'mail':
+        echo "Email Address";
+        break;
+        case 'businessCategory':
+        echo "Business Type";
+        break;
+        default:
+        echo htmlspecialchars($key);
+        break;
+      }
+      echo "</td><td>";
+      switch ($key) {
+        case 'C':
+        echo htmlspecialchars($value);
+        echo ' <img src="'.htmlspecialchars($current_folder) . 'img/blank.gif" class="flag flag-';
+        echo strtolower(htmlspecialchars($value)); 
+        echo '" alt="" />';
+        break;
+        case 'DC':
+        foreach ($value as $key => $value) {
+          echo htmlspecialchars($value) . ".";
         }
-
-        echo "</td><td>";
-        switch ($key) {
-          case 'C':
-          echo htmlspecialchars($value);
-          echo ' <img src="'.htmlspecialchars($current_folder) . 'img/blank.gif" class="flag flag-';
-          echo strtolower(htmlspecialchars($value)); 
-          echo '" alt="" />';
-          break;
-          case 'DC':
+        break;
+        default:
+        if (is_array($value)) {
           foreach ($value as $key => $value) {
-            echo htmlspecialchars($value) . ".";
+            echo htmlspecialchars($value) . " ";
           }
-          break;
-          default:
-          if (is_array($value)) {
-            foreach ($value as $key => $value) {
-              echo htmlspecialchars($value) . " ";
-            }
-          } else {
-            echo htmlspecialchars($value);
-          }
-          break;
+        } else {
+          echo htmlspecialchars($value);
         }
-
-        echo "</td></tr>\n";
+        break;
       }
-      echo "</table>";
-      return;
-    } else {
-      $cert_data = openssl_x509_parse($raw_cert_data);
+      echo "</td>";
+      echo "</tr>";
     }
-    if (empty($cert_data)) {
-      echo "Data not valid.";
-      continue;
+  }
+  // san
+  if (!empty($data['cert_data']['extensions']['subjectAltName'])) {
+  echo "<tr>";
+  echo "<td>Subject Alternative Names</td>";
+  echo "<td>";
+  foreach ( explode("DNS:", $data['cert_data']['extensions']['subjectAltName']) as $altName ) {
+    if ( !empty(str_replace(',', " ", "$altName"))) {
+      echo htmlspecialchars(str_replace(',', " ", "$altName"));
+      echo "<br>";
     }
-    ?>
-    <table class="table table-striped table-bordered">
-      <tr>
-        <td colspan="2"><strong>Certificate Data</strong></td>
-      </tr>
-      <?php
-      $next_cert_data = openssl_x509_parse($raw_next_cert_data);
-      $today = date("Y-m-d");
-      echo "<tr><td colspan='2'>\n";
-      echo "<table class='table'>\n";
-      echo "<thead><tr>\n";
-      echo "<th>Hostname</th>\n";
-      echo "<th>Not Expired</th>\n";
-      echo "<th>Issuer</th>\n";
-      echo "<th>CRL</th>\n";
-      echo "<th>OCSP</th>\n";
-      echo "<th>Signing Type</th>\n";
-      echo "</tr>\n</thead>\n<tbody>\n<tr>";
-      // hostname
-      if ($is_issuer == false) {
-        if ($csr == false) {
-          if ($cert_data['subject']['CN']) {
-            if ( verify_certificate_hostname($raw_cert_data, $host) ) {
-              echo '<td><h1><span class="text-success glyphicon glyphicon-ok"></span>&nbsp;</h1></td>';
-            } else {
-              echo '<td><h1><span class="text-danger glyphicon glyphicon-remove"></span>&nbsp;</h1></td>';
-            }
+  } 
+  echo "</td>";
+  echo "</tr>";
+  }
+  // validation type
+  echo "<tr>";
+  echo "<td>Type</td>";
+  echo "<td>";
+  if ($data["validation_type"] == "extended") {
+    echo '<span class="text-success">Extended Validation</span>';
+  } elseif ($data["validation_type"] == "organization") {
+    echo "Organization Validation";
+  } elseif ($data["validation_type"] == "domain") {
+    echo "Domain Validation";
+  }
+  // full subject
+  echo "</td>";
+  echo "</tr>";
+  echo "<tr>";
+  echo "<td>Full Subject</td>";
+  echo "<td>";
+  echo htmlspecialchars($data['cert_data']['name']);
+  echo "</td>";
+  echo "</tr>";
+  echo "<tr>";
+  echo "<td colspan='2'><strong>Issuer</strong></td>";
+  echo "</tr>";
+  if (!empty($data['cert_data']['issuer']) ) {
+    foreach ($data['cert_data']['issuer'] as $key => $value) {
+      echo "<tr><td>";
+      switch ($key) {
+        case 'C':
+        echo "Country";
+        break;
+        case 'ST':
+        echo "State";
+        break;
+        case 'L':
+        echo "City";
+        break;
+        case 'O':
+        echo "Organization";
+        break;
+        case 'OU':
+        echo "Organizational Unit";
+        break;
+        case 'CN':
+        echo "Common Name";
+        break;
+        case 'mail':
+        echo "Email Address";
+        break;
+        case 'emailAddress':
+        echo "Email Address";
+        break;
+        default:
+        echo htmlspecialchars($key);
+        break;
+      }
+      echo "</td><td>";
+      switch ($key) {
+        case 'C':
+        echo htmlspecialchars($value);
+        echo ' <img src="'.htmlspecialchars($current_folder) . 'img/blank.gif" class="flag flag-';
+        echo strtolower(htmlspecialchars($value)); 
+        echo '" alt="" />';
+        break;
+        case 'DC':
+        foreach ($value as $key => $value) {
+          echo htmlspecialchars($value) . ".";
+        }
+        break;
+        default:
+        if (is_array($value)) {
+          foreach ($value as $key => $value) {
+            echo htmlspecialchars($value) . " ";
           }
         } else {
-          echo "<td></td>";
+          echo htmlspecialchars($value);
         }
-      } else {
-        echo "<td></td>";
-      }
-// expired
-      if ( $today > date(DATE_RFC2822,$cert_data['validFrom_time_t']) || strtotime($today) < strtotime(date(DATE_RFC2822,$cert_data['validTo_time_t'])) ) {
-        echo '<td><h1><span class="text-success glyphicon glyphicon-ok"></span>&nbsp;</h1></td>';
-      } else {
-        echo '<td><h1><span class="text-danger glyphicon glyphicon-remove"></span>&nbsp;</h1></td>';
+        break;
       }
-// issuer
-      if ($raw_next_cert_data) {
-        if (verify_cert_issuer_by_subject_hash($raw_cert_data, $raw_next_cert_data) ) {
-          echo '<td><h1><span class="text-success glyphicon glyphicon-ok"></span>&nbsp;</h1></td>';
+      echo "</td>";
+      echo "</tr>";
+    }
+  }
+  // valid from 
+  echo "<tr>";
+  echo "<td colspan='2'><strong>Validity</strong></td>";
+  echo "</tr>";
+  if ( !empty($data['cert_data']['validFrom_time_t']) ) { 
+    echo "<tr>";
+    echo "<td>Valid From</td>";
+    echo "<td>";
+    if ( $today < date(DATE_RFC2822,$data['cert_data']['validFrom_time_t']) ) {
+      echo '<span class="text-success glyphicon glyphicon-ok-sign"></span>';
+      echo '<span class="text-success"> - ';
+    } else {
+      echo '<span class="text-danger glyphicon glyphicon-exclamation-sign"></span>';
+      echo '<span class="text-danger"> - ';
+    }
+    echo htmlspecialchars(date(DATE_RFC2822,$data['cert_data']['validFrom_time_t'])); 
+    echo "</span>";
+    echo "</td>";
+    echo "</tr>";
+  }
+  // issued to expired
+  if ( !empty($data['cert_data']['validTo_time_t']) ) { 
+    echo "<tr>";
+    echo "<td>Valid Until</td>";
+    echo "<td>";
+    if ( strtotime($today) < strtotime(date(DATE_RFC2822,$data['cert_data']['validTo_time_t'])) ) {
+      echo '<span class="text-success glyphicon glyphicon-ok-sign"></span>';
+      echo '<span class="text-success"> - ';
+    } else {
+      echo '<span class="text-danger glyphicon glyphicon-exclamation-sign"></span>';
+      echo '<span class="text-danger"> - ';
+    }
+    echo htmlspecialchars(date(DATE_RFC2822,$data['cert_data']['validTo_time_t'])); 
+    echo "</span>";
+    echo "</td>";
+    echo "</tr>";
+  };
+  if ( is_array($data['crl']) ) {
+    echo "<tr>";
+    echo "<td>CRL</td>";
+    echo "<td>";
+    foreach ($data['crl'] as $key => $value) {
+      if ($value) {
+        if ($value["status"] == "ok") {
+          echo "<span class='text-success glyphicon glyphicon-ok-sign'></span>";
+          echo "<span class='text-success'> - Not on CRL: " . htmlspecialchars($value["crl_uri"]) . "</span><br>";
+          echo "Last update: " . htmlspecialchars($value['crl_last_update']) . "<br>\n";
+          echo "Next update: " . htmlspecialchars($value['crl_next_update']) . "<br>\n";
+        } elseif ($value["status"] == "revoked") {
+          echo "<span class='text-danger glyphicon glyphicon-exclamation-sign'></span>";
+          echo "<span class='text-danger'> - Revoked on CRL: " . htmlspecialchars($value["crl_uri"]) . "</span><br>\n";
+          echo "<span class='text-danger'>Revocation date: " . htmlspecialchars($value["revoked_on"]) . "</span><br>\n";
+          echo "<br>Last update: " . htmlspecialchars($value['crl_last_update']) . "<br>\n";
+          echo "Next update: " . htmlspecialchars($value['crl_next_update']) . "<br>\n";
         } else {
-          echo '<td><h1><span class="text-danger glyphicon glyphicon-remove"></span>&nbsp;</h1></td>';
+          echo "<span class='text-danger glyphicon glyphicon-exclamation-sign'></span>";
+          echo "<span class='text-danger'> - CRL invalid: (" . htmlspecialchars($value["crl_uri"]) . ")</span><br>";
+          echo "<pre> " . htmlspecialchars($value["error"]) . "</pre>";
         }
-      } else {
-        echo '<td> </td>';
       }
-// crl
-      if ( !empty($cert_data['extensions']['crlDistributionPoints']) ) {
-        echo "<td><h1>" . crl_verify($raw_cert_data, false) . " &nbsp; </h1></td>";
-      } else {
-        echo '<td> </td>';
+      if (count($data['ocsp']) > 1) {
+        echo "<hr>";
       }
-// ocsp
-      if ( !empty($cert_data['extensions']['authorityInfoAccess']) && !empty($next_cert_data) ) {
-        echo "<td>";
-        $ocsp_uri = explode("OCSP - URI:", $cert_data['extensions']['authorityInfoAccess'])[1];
-        $ocsp_uri = explode("\n", $ocsp_uri)[0];
-        $ocsp_uri = explode(" ", $ocsp_uri)[0];
-        if (!empty($ocsp_uri)) {
-          $ocsp_result = ocsp_verify($raw_cert_data, $raw_next_cert_data);
-          if ($ocsp_result["ocsp_verify_status"] == "good") { 
-            echo '<h1><span class="text-success glyphicon glyphicon-ok"></span>&nbsp;</h1>';
-          } else if ($ocsp_result["ocsp_verify_status"] == "revoked") {
-            echo '<h1><span class="text-danger glyphicon glyphicon-remove"></span>&nbsp;</h1>';
-          } else {
-            echo '<h1><span class="text-danger glyphicon glyphicon-question-sign"></span>&nbsp;</h1>';
-          }
+    }
+    echo "</td>";
+    echo "</tr>";
+  } else {
+    echo "<tr><td>CRL</td><td>No CRL URI found in certificate</td></tr>";
+  }
+  // ocsp
+  if ( is_array($data['ocsp'])) { 
+    echo "<tr>";
+    echo "<td>OCSP</td>";
+    echo "<td>";
+    foreach ($data['ocsp'] as $key => $value) {
+      if ($value) {
+        if ($value["status"] == "good") { 
+          echo '<span class="text-success glyphicon glyphicon-ok-sign"></span> ';
+          echo '<span class="text-success"> - OK: ';
+          echo htmlspecialchars($value['ocsp_uri']);
+          echo "</span><br>";
+          echo "Last update: " . htmlspecialchars($value["this_update"]) . "<br>\n";
+          echo "Next update: " . htmlspecialchars($value["next_update"]) . "<br>\n";
+        } else if ( $value["status"] == "revoked") {
+          echo '<span class="text-danger glyphicon glyphicon-remove-sign"></span>';
+          echo '<span class="text-danger"> - REVOKED: ';
+          echo htmlspecialchars($value['ocsp_uri']);
+          echo "</span><br>";
+          echo "<span class='text-danger'>Revocation Time: " . htmlspecialchars($value["revocation_time"]) . "<br>\n";
+          echo "Revocation Reason: " . htmlspecialchars($value["reason"]). "</span><br>";
+          echo "<br>Last update: " . htmlspecialchars($value["this_update"]) . "<br>\n";
+          echo "Next update: " . htmlspecialchars($value["next_update"]) . "<br>\n";
         } else {
-            echo "<td></td>";
+          echo '<span class="text-danger glyphicon glyphicon-question-sign"></span>';
+          echo '<span class="text-danger"> - UNKNOWN: ';
+          echo " - " . htmlspecialchars($value['ocsp_uri']) . "</span><br>";
+          echo "<pre>" . htmlspecialchars($value["error"]) . "</pre>";
         }
-        echo "</td>";
-      } else {
-        echo "<td> </td>";
       }
-      // self signed/ca/ca root
-      if (strpos($cert_data['extensions']['basicConstraints'], "CA:TRUE") !== false && $cert_data['issuer']['CN'] == $cert_data['subject']['CN'] ) {
-        echo '<td><span class="text-success">CA Root Certificate</span></td>';
-      } else if (strpos($cert_data['extensions']['basicConstraints'], "CA:TRUE") !== false) {
-        echo '<td><span class="text-success">CA Certificate</span></td>';
-      } else if ($cert_data['issuer']['CN'] == $cert_data['subject']['CN']) {
-        echo '<td><span class="text-danger">Self Signed</span></td>';
-      } else {
-        echo "<td>Signed by CA</td>";
+      if (count($data['ocsp']) > 1) {
+        echo "<hr>";
       }
-      echo "</tr>";
-      echo "</tbody></table>";
-      echo "</td></tr>";
-
-
-      if (!empty($cert_data['subject']) ) {
-        foreach ($cert_data['subject'] as $key => $value) {
-          echo "<tr><td>";
-          switch ($key) {
-            case 'C':
-            echo "Country";
-            break;
-            case 'ST':
-            echo "State";
-            break;
-            case 'L':
-            echo "City";
-            break;
-            case 'O':
-            echo "Organization";
-            break;
-            case 'OU':
-            echo "Organizational Unit";
-            break;
-            case 'CN':
-            echo "Common Name";
-            break;
-            case 'mail':
-            echo "Email Address";
-            break;
-            case 'businessCategory':
-            echo "Business Type";
-            break;
-            default:
-            echo htmlspecialchars($key);
-            break;
-          }
-          echo "</td><td>";
-          switch ($key) {
-            case 'C':
-            echo htmlspecialchars($value);
-            echo ' <img src="'.htmlspecialchars($current_folder) . 'img/blank.gif" class="flag flag-';
-            echo strtolower(htmlspecialchars($value)); 
-            echo '" alt="" />';
-            break;
-            case 'DC':
-            foreach ($value as $key => $value) {
-              echo htmlspecialchars($value) . ".";
-            }
-            break;
-            default:
-            if (is_array($value)) {
-              foreach ($value as $key => $value) {
-                echo htmlspecialchars($value) . " ";
-              }
-            } else {
-              echo htmlspecialchars($value);
-            }
-            break;
-          }
-          echo "</td></tr>\n";
-        }
-
-
+    }
+  } else {
+    if ($data["ocsp"] == "No issuer cert provided. Unable to send OCSP request.") {
+      echo "<tr><td>OCSP</td><td>No issuer certificate provided. Unable to send OCSP request.</td></tr>";
+    } else {
+      echo "<tr><td>OCSP</td><td>No OCSP URI found in certificate</td></tr>";
+    }
+  }
+  echo "<tr>";
+  echo "<td>Hostname Validation</td>";
+  echo "<td>";
+  // hostname validation
+  if ($data["hostname_in_san_or_cn"] == "true") {
+    echo "<span class='text-success glyphicon glyphicon-ok'></span>\n<span class='text-success'> - ";
+    echo htmlspecialchars($data['hostname_checked']);
+    echo " found in CN or SAN.</span>";
+  } elseif ($data["hostname_in_san_or_cn"] == "false")  {
+    echo '<span class="text-danger glyphicon glyphicon-remove"></span><span class="text-danger"> - ';
+    echo htmlspecialchars($data['hostname_checked']); 
+    echo ' NOT found in CN or SAN.</span>';
+  } elseif ($data["hostname_in_san_or_cn"] == "n/a; ca signing certificate")  {
+    echo "Not applicable, this seems to be a CA signing certificate.";
+  } else {
+    echo "Not applicable, this seems to be a CA signing certificate.";
+  }
+  echo "</td>";
+  echo "</tr>";
+  // details
+  echo "<tr>";
+  echo "<td colspan='2'><strong>Details</strong></td>";
+  echo "</tr>";
+  if ( !empty($data['cert_data']['purposes']) ) { 
+    echo "<tr>";
+    echo "<td>Purposes</td>";
+    echo "<td>";
+    foreach ($data['cert_data']['purposes'] as $key => $purpose) {
+      if ($purpose["general"]) {
+        echo htmlspecialchars($key);
+        echo " ";
       }
-      if (!empty($cert_data['extensions']['subjectAltName'])) {
-        ?>
-        <tr>
-          <td>Subject Alternative Names</td>
-          <td>
+    }
+    echo "</td>";
+    echo "</tr>";
+    echo "<tr>";
+    echo "<td>Purposes CA</td>";
+    echo "<td>";
+    foreach ($data['cert_data']['purposes'] as $key => $purpose) {
+      if ($purpose["ca"]) {
+        echo htmlspecialchars($key);
+        echo " ";
+      }
+    }
+    echo "</td>";
+    echo "</tr>";
+  }
+  // serial number
+  if (!empty($data['serialNumber']) ) { 
+    echo "<tr>";
+    echo "<td>Serial</td>";
+    echo "<td>";
+    echo htmlspecialchars($data['serialNumber']);
+    echo "</td>";
+    echo "</tr>";
+  }
+  echo "<tr>";
+  echo "<td>Key Size / Type</td>";
+  echo "<td>";
+  // key details
+  echo htmlspecialchars($data["key"]['bits']);
+  echo " bits ";
+  echo htmlspecialchars($data["key"]['type']);
+  echo "</td>";
+  echo "</tr>";
+  echo "<tr>";
+  echo "<td>Signature Algorithm</td>";
+  echo "<td>";
+  echo $data["key"]["signature_algorithm"];
+  echo "</td>";
+  echo "</tr>";
+  if (count($data['cert_data']['extensions']) >= 1) {
+    echo "<tr>";
+    echo "<td>Extensions</td>";
+    echo "<td>";
+    ?>
+    <div class="panel-group" id="accordion<?php echo bcdechex($data['cert_data']['serialNumber']); ?>" role="tablist" aria-multiselectable="true">
+      <div class="panel panel-default">
+        <div class="panel-heading" role="tab" id="heading<?php echo bcdechex($data['cert_data']['serialNumber']); ?>">
+          <h4 class="panel-title">
+            <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapse<?php echo bcdechex($data['cert_data']['serialNumber']); ?>" aria-expanded="false" aria-controls="collapse<?php echo bcdechex($data['cert_data']['serialNumber']); ?>">
+              Click to Open/Close
+            </a>
+          </h4>
+        </div>
+        <div id="collapse<?php echo bcdechex($data['cert_data']['serialNumber']); ?>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading<?php echo bcdechex($data['cert_data']['serialNumber']); ?>">
+          <div class="panel-body">
             <?php 
-            foreach ( explode("DNS:", $cert_data['extensions']['subjectAltName']) as $altName ) {
-              if ( !empty(str_replace(',', " ", "$altName"))) {
-                echo htmlspecialchars(str_replace(',', " ", "$altName"));
-                echo "<br>";
+            foreach ($data['cert_data']['extensions'] as $name=>$extension) {
+
+              if ( !empty(str_replace(',', " ", "$extension"))) {
+                echo "<strong>" . htmlspecialchars("$name") . "</strong>";
+                echo "<pre>";
+                echo htmlspecialchars($extension);
+                echo "</pre>";
               }
             } 
-          ?>
-        </td>
-      </tr>
-      <?php
-      }
-      ?>
-      <tr>
-        <td>Type</td>
-        <td>
-          <?php              
-          if ( array_search(explode("Policy: ", explode("\n", $cert_data['extensions']['certificatePolicies'])[0])[1], $ev_oids) ) {
-            echo '<span class="text-success">Extended Validation</span>';
-          } else if ( isset($cert_data['subject']['O'] ) ) {
-            echo "Organisation Validation";
-          } else if ( isset($cert_data['subject']['CN'] ) ) {
-            echo "Domain Validation";
-          }
-          ?>
-        </td>
-      </tr>
-      <tr>
-        <td>Full Subject</td>
-        <td><?php echo htmlspecialchars($cert_data['name']); ?></td>
-      </tr>
-      <tr>
-        <td colspan="2"><strong>Issuer</strong></td>
-      </tr>
-      <?php 
-      if (!empty($cert_data['issuer']) ) {
-        foreach ($cert_data['issuer'] as $key => $value) {
-          echo "<tr><td>";
-          switch ($key) {
-            case 'C':
-            echo "Country";
-            break;
-            case 'ST':
-            echo "State";
-            break;
-            case 'L':
-            echo "City";
-            break;
-            case 'O':
-            echo "Organization";
-            break;
-            case 'OU':
-            echo "Organizational Unit";
-            break;
-            case 'CN':
-            echo "Common Name";
-            break;
-            case 'mail':
-            echo "Email Address";
-            break;
-            case 'emailAddress':
-            echo "Email Address";
-            break;
-            default:
-            echo htmlspecialchars($key);
-            break;
-          }
-          echo "</td><td>";
-          switch ($key) {
-            case 'C':
-            echo htmlspecialchars($value);
-            echo ' <img src="'.htmlspecialchars($current_folder) . 'img/blank.gif" class="flag flag-';
-            echo strtolower(htmlspecialchars($value)); 
-            echo '" alt="" />';
-            break;
-            case 'DC':
-            foreach ($value as $key => $value) {
-              echo htmlspecialchars($value) . ".";
-            }
-            break;
-            default:
-            if (is_array($value)) {
-              foreach ($value as $key => $value) {
-                echo htmlspecialchars($value) . " ";
-              }
-            } else {
-              echo htmlspecialchars($value);
-            }
-            break;
-          }
-          echo "</td></tr>\n";
-        }
-      }
-      ?>
-      <tr>
-        <td colspan="2"><strong>Validity</strong></td>
-      </tr>
-      <?php  
-      if ( !empty($cert_data['validFrom_time_t']) ) { 
-        ?>
-        <tr>
-          <td>Valid From</td>
-          <td>
-            <?php 
-            if ( $today < date(DATE_RFC2822,$cert_data['validFrom_time_t']) ) {
-              echo '<span class="text-success glyphicon glyphicon-ok-sign"></span>';
-              echo '<span class="text-success"> - ';
-            } else {
-              echo '<span class="text-danger glyphicon glyphicon-exclamation-sign"></span>';
-              echo '<span class="text-danger"> - ';
-
-            }
-            echo htmlspecialchars(date(DATE_RFC2822,$cert_data['validFrom_time_t'])); 
-            echo "</span>";
-            ?>
-          </td>
-        </tr>
-
-        <?php
-      };
-      if ( !empty($cert_data['validTo_time_t']) ) { 
-        ?>
-        <tr>
-          <td>Valid Until</td>
-          <td>
+    echo "</div>";
+    echo "</div>";
+    echo "</div>";
+    echo "</div>";
+    echo "</td>";
+    echo "</tr>";
+  } else {
+    echo "<tr>";
+    echo "<td>Extensions</td>";
+    echo "<td>";
+    echo "None";
+    echo "</td>";
+    echo "</tr>";
+  }
+  if(!empty($data["key"]["certificate_pem"])) {
+    echo "<tr>";
+    echo "<td>Certificate PEM </td>";
+    echo "<td>";
+    ?>
+    <div class="panel-group" id="pem-accordion<?php echo bcdechex($data['cert_data']['serialNumber']); ?>" role="tablist" aria-multiselectable="true">
+      <div class="panel panel-default">
+        <div class="panel-heading" role="tab" id="pem-heading<?php echo bcdechex($data['cert_data']['serialNumber']); ?>">
+          <h4 class="panel-title">
+            <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#pem-collapse<?php echo bcdechex($data['cert_data']['serialNumber']); ?>" aria-expanded="false" aria-controls="pem-collapse<?php echo bcdechex($data['cert_data']['serialNumber']); ?>">
+              Click to Open/Close
+            </a>
+          </h4>
+        </div>
+        <div id="pem-collapse<?php echo bcdechex($data['cert_data']['serialNumber']); ?>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="pem-heading<?php echo bcdechex($data['cert_data']['serialNumber']); ?>">
+          <div class="panel-body">
             <?php 
-            if ( strtotime($today) < strtotime(date(DATE_RFC2822,$cert_data['validTo_time_t'])) ) {
-              echo '<span class="text-success glyphicon glyphicon-ok-sign"></span>';
-              echo '<span class="text-success"> - ';
-            } else {
-              echo '<span class="text-danger glyphicon glyphicon-exclamation-sign"></span>';
-              echo '<span class="text-danger"> - ';
-            }
-            echo htmlspecialchars(date(DATE_RFC2822,$cert_data['validTo_time_t'])); 
-            echo "</span>";
-            ?>
-          </td>
-        </tr>
-        <?php
-      };
-      if ( !empty($cert_data['extensions']['crlDistributionPoints']) ) {
-        ?>
-        <tr>
-          <td>CRL</td>
-          <td>
-            <?php            
-            echo crl_verify($raw_cert_data);
-            ?>
-          </td>
-        </tr>
-        <?php
-      } else {
-        echo "<tr><td>CRL</td><td>No CRL URI found in certificate</td></tr>";
-      }
-      if ( !empty($cert_data['extensions']['authorityInfoAccess']) && !empty($next_cert_data) ) { 
-        ?>
-        <tr>
-          <td>OCSP</td>
-          <td>
-            <?php
-            $ocsp_uri = explode("OCSP - URI:", $cert_data['extensions']['authorityInfoAccess'])[1];
-            $ocsp_uri = explode("\n", $ocsp_uri)[0];
-            $ocsp_uri = explode(" ", $ocsp_uri)[0];
-
-            if ( isset($raw_next_cert_data) && !empty($ocsp_uri) ) {
-              if ($ocsp_result["ocsp_verify_status"] == "good") { 
-                echo '<span class="text-success glyphicon glyphicon-ok-sign"></span> ';
-                echo '<span class="text-success"> - OK: ';
-                echo htmlspecialchars($ocsp_uri);
-                echo "</span><br><pre>This update: " . htmlspecialchars($ocsp_result["This Update"]) . " - ";
-                echo "<br>Next update: " . htmlspecialchars($ocsp_result["Next Update"]) . "</pre>";
-              } else if ( $ocsp_result["ocsp_verify_status"] == "revoked") {
-                echo '<span class="text-danger glyphicon glyphicon-remove-sign"></span>';
-                echo '<span class="text-danger"> - REVOKED: ';
-                echo htmlspecialchars($ocsp_uri);
-                echo "</span><br><pre>This update: " . htmlspecialchars($ocsp_result["This Update"]);
-                echo "<br>Next update: " . htmlspecialchars($ocsp_result["Next Update"]);
-                echo "<br>Revocation Time: " . htmlspecialchars($ocsp_result["Revocation Time"]);
-                echo "<br>Revocation Reason: " . htmlspecialchars($ocsp_result["Reason"]). "</pre>";
-              } else {
-                echo '<span class="text-danger glyphicon glyphicon-question-sign"></span>';
-                echo '<span class="text-danger"> - UNKNOWN: ';
-
-                echo " - " . htmlspecialchars($ocsp_uri) . "</span><br>";
-                echo "<pre>" . htmlspecialchars($ocsp_result["unknown"]) . "</pre>";
-              }
-            } else {
-                echo "No OCSP URI found in certificate";
-            }
-            ?>
-          </td>
-        </tr>
-        <?php 
-      } else {
-        echo "<tr><td>OCSP</td><td>No OCSP URI found in certificate</td></tr>";
-      }
-      if ($is_issuer == false && $csr == false) {
-        if ($cert_data['subject']['CN']) {
-          echo '<tr><td>Hostname</td>';
-          if ( verify_certificate_hostname($raw_cert_data, $host, $port) ) {
-            echo "<td><span class='text-success glyphicon glyphicon-ok'></span>\n<span class='text-success'> - ";
-            echo htmlspecialchars($host);
-            echo " found in CN or SAN.</span></td></tr>";
-          } else {
+            echo "<pre>";
+            echo htmlspecialchars($data["key"]["certificate_pem"]);
+    echo "</pre>";
+    echo "</div>";
+    echo "</div>";
+    echo "</div>";
+    echo "</div>";
+    echo "</td>";
+    echo "</tr>";
+  }
             
-            echo '<td><span class="text-danger glyphicon glyphicon-remove"></span><span class="text-danger"> - ';
-            echo htmlspecialchars($host); 
-            echo ' NOT found in CN or SAN.</span></td></tr>';
-          }
-        }
-      } else {
-        if ($csr == false) {
-          echo "<tr><td>Hostname</td><td>Not applicable, this seems to be a CA signing certificate.</td></tr>";
-        } else {
-          echo "<tr><td>Hostname</td><td>Not applicable, this seems to be a CSR.</td></tr>";
-        }
-      }
-      ?>
-        <tr>
-          <td colspan="2"><strong>Details</strong></td>
-        </tr>
-        <?php
-      if ( !empty($cert_data['purposes']) ) { 
-        ?>
-        <tr>
-          <td>Purposes</td>
-          <td>
-            <?php 
-            $purposes_len = count($cert_data['purposes']);
-            foreach ($cert_data['purposes'] as $key => $purpose) {
-              echo htmlspecialchars($purpose[2]);
-              if ( $key != $purposes_len - 1) {
-                echo ", ";
-              }
-            }
-              ?>
-          </td>
-        </tr>
-        <?php 
-      };
-      if ( !empty($cert_data['serialNumber']) ) { 
-        ?>
-        <tr>
-          <td>Serial</td>
-          <td><code>
-            <?php
-            $sn = str_split(strtoupper(bcdechex($cert_data['serialNumber'])), 2);
-            $sn_len = count($sn);
-            foreach ($sn as $key => $s) {
-              echo htmlspecialchars($s);
-              if ( $key != $sn_len - 1) {
-                echo ":";
-              }
-            }
-            ?>
-          </code></td>
-        </tr>
-        <?php 
-        }
-        ?>
-        <tr>
-          <td>Key Size / Type</td>
-          <td>
+  if(!empty($data['key']['public_key_pem'])) {
+    echo "<tr>";
+    echo "<td>Public Key PEM </td>";
+    echo "<td>";
+    ?>
+    <div class="panel-group" id="pub-pem-accordion<?php echo bcdechex($data['cert_data']['serialNumber']); ?>" role="tablist" aria-multiselectable="true">
+      <div class="panel panel-default">
+        <div class="panel-heading" role="tab" id="pub-pem-heading<?php echo bcdechex($data['cert_data']['serialNumber']); ?>">
+          <h4 class="panel-title">
+            <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#pub-pem-collapse<?php echo bcdechex($data['cert_data']['serialNumber']); ?>" aria-expanded="false" aria-controls="pub-pem-collapse<?php echo bcdechex($data['cert_data']['serialNumber']); ?>">
+              Click to Open/Close
+            </a>
+          </h4>
+        </div>
+        <div id="pub-pem-collapse<?php echo bcdechex($data['cert_data']['serialNumber']); ?>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="pub-pem-heading<?php echo bcdechex($data['cert_data']['serialNumber']); ?>">
+          <div class="panel-body">
             <?php
-            
+              echo "<pre>"; 
+              echo htmlspecialchars($data['key']['public_key_pem']);
+    echo "</pre>";
+    echo "</div>";
+    echo "</div>";
+    echo "</div>";
+    echo "</div>";
+    echo "</td>";
+    echo "</tr>";
+    echo "<tr>";
+    echo "<td><a href='https://raymii.org/s/articles/HTTP_Public_Key_Pinning_Extension_HPKP.html'>SPKI Hash</a></td>";
+    echo "<td>";
+    print(htmlspecialchars($data['key']['spki_hash']));
+    echo "</td>";
+    echo "</tr>";
+  }
+  echo "</tbody>";
+  echo "</table>";
+}
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-            $key_details = openssl_pkey_get_details(openssl_pkey_get_public($raw_cert_data));
-            $export_pem = "";
-            openssl_x509_export($raw_cert_data, $export_pem);
-
-            if ( $key_details['rsa'] ) {
-              echo htmlspecialchars($key_details['bits']);
-              echo " bits RSA";
-            } else if ( $key_details['dsa'] ) {
-              echo htmlspecialchars($key_details['bits']);
-              echo " bits DSA";
-            } else if ( $key_details['dh'] ) {
-              echo htmlspecialchars($key_details['bits']);
-              echo " bits DH";
-            } else {
-              echo htmlspecialchars(var_dump($key_details['bits']));
-              echo " bits";
-            }
-            ?>
-          </td>
-        </tr>
-        <tr>
-          <td>Signature Algorithm</td>
-          <td>
-            <?php
-              $signature_algorithm = cert_signature_algorithm($raw_cert_data);
-              echo htmlspecialchars($signature_algorithm);
-            ?>
-          </td>
-        </tr>
-        <tr>
-          <td>Extensions</td>
-          <td>
-            <div class="panel-group" id="accordion<?php echo bcdechex($cert_data['serialNumber']); ?>" role="tablist" aria-multiselectable="true">
-              <div class="panel panel-default">
-                <div class="panel-heading" role="tab" id="heading<?php echo bcdechex($cert_data['serialNumber']); ?>">
-                  <h4 class="panel-title">
-                    <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapse<?php echo bcdechex($cert_data['serialNumber']); ?>" aria-expanded="false" aria-controls="collapse<?php echo bcdechex($cert_data['serialNumber']); ?>">
-                      Click to Open/Close
-                    </a>
-                  </h4>
-                </div>
-                <div id="collapse<?php echo bcdechex($cert_data['serialNumber']); ?>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="heading<?php echo bcdechex($cert_data['serialNumber']); ?>">
-                  <div class="panel-body">
-                    <?php 
-                    foreach ( $cert_data['extensions'] as $name=>$extension ) {
-                      if ( !empty(str_replace(',', " ", "$extension"))) {
-                        echo "<strong>" . htmlspecialchars("$name") . "</strong>";
-                        echo "<pre>";
-                        echo htmlspecialchars($extension);
-                        echo "</pre>";
-                      }
-                    } 
-                    ?>
-                  </div>
-                </div>
-                </div>
-                </div>
-              </td>
-            </tr>
-            <?php 
-             if(!empty($export_pem)) {
-            ?>
-            <tr>
-          <td>Certificate PEM </td>
-          <td>
-            <div class="panel-group" id="pem-accordion<?php echo bcdechex($cert_data['serialNumber']); ?>" role="tablist" aria-multiselectable="true">
-              <div class="panel panel-default">
-                <div class="panel-heading" role="tab" id="pem-heading<?php echo bcdechex($cert_data['serialNumber']); ?>">
-                  <h4 class="panel-title">
-                    <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#pem-collapse<?php echo bcdechex($cert_data['serialNumber']); ?>" aria-expanded="false" aria-controls="pem-collapse<?php echo bcdechex($cert_data['serialNumber']); ?>">
-                      Click to Open/Close
-                    </a>
-                  </h4>
-                </div>
-                <div id="pem-collapse<?php echo bcdechex($cert_data['serialNumber']); ?>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="pem-heading<?php echo bcdechex($cert_data['serialNumber']); ?>">
-                  <div class="panel-body">
-                    <?php 
-                    echo "<pre>";
-                    echo htmlspecialchars($export_pem);
-                    ?>
-                    </pre>
-                  </div>
-                </div>
-                </div>
-                </div>
-              </td>
-            </tr>
-            <?php
-            }
-            ?>
-            <?php 
-             if(!empty($key_details['key'])) {
-            ?>
-            <tr>
-          <td>Public Key PEM </td>
-          <td>
-            <div class="panel-group" id="pub-pem-accordion<?php echo bcdechex($cert_data['serialNumber']); ?>" role="tablist" aria-multiselectable="true">
-              <div class="panel panel-default">
-                <div class="panel-heading" role="tab" id="pub-pem-heading<?php echo bcdechex($cert_data['serialNumber']); ?>">
-                  <h4 class="panel-title">
-                    <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#pub-pem-collapse<?php echo bcdechex($cert_data['serialNumber']); ?>" aria-expanded="false" aria-controls="pub-pem-collapse<?php echo bcdechex($cert_data['serialNumber']); ?>">
-                      Click to Open/Close
-                    </a>
-                  </h4>
-                </div>
-                <div id="pub-pem-collapse<?php echo bcdechex($cert_data['serialNumber']); ?>" class="panel-collapse collapse" role="tabpanel" aria-labelledby="pub-pem-heading<?php echo bcdechex($cert_data['serialNumber']); ?>">
-                  <div class="panel-body">
-                  
-                    <?php
-                      echo "<pre>"; 
-                      echo htmlspecialchars($key_details['key']);
-                    ?>
-                    </pre>
-                  </div>
-                </div>
-                </div>
-                </div>
-              </td>
-            </tr>
-            <tr>
-            <td><a href="https://raymii.org/s/articles/HTTP_Public_Key_Pinning_Extension_HPKP.html">SPKI Hash</a></td>
-              <td>
-                  <?php 
-                      $spki_hash = spki_hash($export_pem);
-                      print(htmlspecialchars($spki_hash));
-                  ?>
-              </td>
-            </tr>
-            <?php
-            }
-            ?>
-          </tbody>
-        </table>
-        <?php
-      }
 
 
 
@@ -692,7 +675,7 @@ function csr_parse_json($csr) {
     $cert_subject = openssl_csr_get_subject($csr);
     $result["subject"] = $cert_subject;
     $result["key"] = $cert_key;
-    $result["details"] = $cert_details;    
+    $result["details"] = $cert_details; 
   } elseif (strpos($csr, "BEGIN CERTIFICATE") !== false) { 
     $result = cert_parse_json($csr);
   } else {
@@ -722,30 +705,74 @@ function cert_parse_json($raw_cert_data, $raw_next_cert_data=null, $host=null, $
     $cert_data['purposes'] = $purposes;
     $result["cert_data"] = $cert_data;
   }
+
+// valid from 
+  if ( !empty($result['cert_data']['validFrom_time_t']) ) { 
+    if ( $today < date(DATE_RFC2822,$result['cert_data']['validFrom_time_t']) ) {
+      $result['cert_issued_in_future'] = false;
+    } else {
+      $result['cert_issued_in_future'] = true;
+      $result['warning'][] = "Certificate issue date is in the future: " . date(DATE_RFC2822,$data['cert_data']['validFrom_time_t']); 
+    }
+  }
+  // expired
+  if (!empty($cert_data['validTo_time_t'])) { 
+    if ($today > date(DATE_RFC2822,$cert_data['validFrom_time_t']) || strtotime($today) < strtotime(date(DATE_RFC2822,$cert_data['validTo_time_t']))) {
+      $result['cert_expired'] = false;
+    } else {
+      $result['cert_expired'] = true;
+      $result['warning'][] = "Certificate expired! Expiration date: " . date(DATE_RFC2822,$cert_data['validTo_time_t']);
+    }
+  }
+
   if ( array_search(explode("Policy: ", explode("\n", $cert_data['extensions']['certificatePolicies'])[0])[1], $ev_oids) ) {
     $result["validation_type"] = "extended";
   } else if ( isset($cert_data['subject']['O'] ) ) {
-    $result["validation_type"] = "organisation";
+    $result["validation_type"] = "organization";
   } else if ( isset($cert_data['subject']['CN'] ) ) {
     $result["validation_type"] = "domain";
   }
+  // issuer
+  if ($raw_next_cert_data) {
+    if (verify_cert_issuer_by_subject_hash($raw_cert_data, $raw_next_cert_data) ) {
+      $result["issuer_valid"] = true; 
+    } else {
+      $result["issuer_valid"] = false;
+      $result['warning'][] = "Provided certificate issuer does not match issuer in certificate. Sent chain order wrong.";
+    }
+  } 
   // crl
   if (isset($cert_data['extensions']['crlDistributionPoints']) ) {
     $result["crl"] = crl_verify_json($raw_cert_data);
+    if (is_array($result["crl"])) {
+      foreach ($result["crl"] as $key => $value) {
+        if ($value["status"] == "revoked") {
+          $result['warning'][] = "Certificate revoked on CRL: " . $value['crl_uri'] . ". Revocation time: " . $value['revoked_on'] . ".";
+        }
+      }
+    }
   } else {
     $result["crl"] = "No CRL URI found in certificate";
   }
   // ocsp
-  if (isset($cert_data['extensions']['authorityInfoAccess']) && isset($next_cert_data) ) { 
+  if (isset($cert_data['extensions']['authorityInfoAccess'])) { 
     $ocsp_uris = explode("OCSP - URI:", $cert_data['extensions']['authorityInfoAccess']);
     unset($ocsp_uris[0]);
-    if ( isset($raw_next_cert_data) && isset($ocsp_uris) ) {
-      foreach ($ocsp_uris as $key => $ocsp_uri) {
-        $ocsp_uri = explode("\n", $ocsp_uri)[0];
-        $ocsp_uri = explode(" ", $ocsp_uri)[0];
-        $result["ocsp"]["$key"] = ocsp_verify_json($raw_cert_data, $raw_next_cert_data, $ocsp_uri);
+    if (isset($ocsp_uris) ) {
+      if (isset($raw_next_cert_data)) {
+        foreach ($ocsp_uris as $key => $ocsp_uri) {
+          $ocsp_uri = explode("\n", $ocsp_uri)[0];
+          $ocsp_uri = explode(" ", $ocsp_uri)[0];
+          $result["ocsp"]["$key"] = ocsp_verify_json($raw_cert_data, $raw_next_cert_data, $ocsp_uri);
+          if ($result['ocsp'][$key]["status"] == "revoked") {
+            $result['warning'][] = "Certificate revoked on OCSP: " . $result['ocsp'][$key]['ocsp_uri'] . ". Revocation time: " . $result['ocsp'][$key]['revocation_time'] . ".";
+          } elseif ($result['ocsp'][$key]["status"] == "unknown") {
+            $result['warning'][] = "OCSP error on: " . $result['ocsp'][$key]['ocsp_uri'] . ".";
+          }
+        } 
+      } else {
+        $result["ocsp"] = "No issuer cert provided. Unable to send OCSP request.";
       }
-        
     } else {
         $result["ocsp"] = "No OCSP URI found in certificate";
     }
@@ -754,28 +781,30 @@ function cert_parse_json($raw_cert_data, $raw_next_cert_data=null, $host=null, $
   }
   // hostname validation
   if ($validate_hostname == true) {
+    $result["hostname_checked"] = $host;
     if (isset($cert_data['subject']['CN'])) {
       if ( verify_certificate_hostname($raw_cert_data, $host) ) {
         $result["hostname_in_san_or_cn"] = "true";
       } else {
         $result["hostname_in_san_or_cn"] = "false";
+        $result['warning'][] = "Hostname " . $host . " not found in certificate.";
       }
     }
   } else {
     $result["hostname_in_san_or_cn"] = "n/a; ca signing certificate";
   }
-  //serial
+  //serial number
   if ( isset($cert_data['serialNumber']) ) { 
-    $serial = "";
+    $serial = [];
     $sn = str_split(strtoupper(bcdechex($cert_data['serialNumber'])), 2);
     $sn_len = count($sn);
     foreach ($sn as $key => $s) {
-      $serial += htmlspecialchars($s);
+      $serial[] = htmlspecialchars($s);
       if ( $key != $sn_len - 1) {
-        $serial += ":";
+        $serial[] = ":";
       }
     }
-    $result["serial"] = $serial;
+    $result["serialNumber"] = implode("", $serial);
   }
 
   // key details
@@ -785,6 +814,9 @@ function cert_parse_json($raw_cert_data, $raw_next_cert_data=null, $host=null, $
   if (isset($key_details['rsa'])) {
     $result["key"]["type"] = "rsa";
     $result["key"]["bits"] = $key_details['bits'];
+    if ($key_details['bits'] < 2048) {
+      $result['warning'][] = $key_details['bits'] . " bit RSA key is not safe. Upgrade to at least 4096 bits.";
+    }
   } else if (isset($key_details['dsa'])) {
     $result["key"]["type"] = "dsa";
     $result["key"]["bits"] = $key_details['bits'];
@@ -800,6 +832,9 @@ function cert_parse_json($raw_cert_data, $raw_next_cert_data=null, $host=null, $
   }
   // signature algorithm
   $result["key"]["signature_algorithm"] = cert_signature_algorithm($raw_cert_data);
+  if ($result["key"]["signature_algorithm"] == "sha1WithRSAEncryption") {
+    $result['warning'][] = "SHA-1 certificate. Upgrade (re-issue) to SHA-256 or better.";
+  }
   if(isset($export_pem)) {
     $result["key"]["certificate_pem"] = $export_pem;
   }