mirror of
https://github.com/gchq/CyberChef.git
synced 2024-11-16 08:58:30 +01:00
Merge branch 'edwardwall-patch-2'
This commit is contained in:
commit
c123d7370a
1 changed files with 10 additions and 7 deletions
|
@ -181,8 +181,8 @@ class ParseX509Certificate extends Operation {
|
||||||
Serial number: ${new r.BigInteger(sn, 16).toString()} (0x${sn})
|
Serial number: ${new r.BigInteger(sn, 16).toString()} (0x${sn})
|
||||||
Algorithm ID: ${cert.getSignatureAlgorithmField()}
|
Algorithm ID: ${cert.getSignatureAlgorithmField()}
|
||||||
Validity
|
Validity
|
||||||
Not Before: ${nbDate} (dd-mm-yy hh:mm:ss) (${cert.getNotBefore()})
|
Not Before: ${nbDate} (dd-mm-yyyy hh:mm:ss) (${cert.getNotBefore()})
|
||||||
Not After: ${naDate} (dd-mm-yy hh:mm:ss) (${cert.getNotAfter()})
|
Not After: ${naDate} (dd-mm-yyyy hh:mm:ss) (${cert.getNotAfter()})
|
||||||
Issuer
|
Issuer
|
||||||
${issuerStr}
|
${issuerStr}
|
||||||
Subject
|
Subject
|
||||||
|
@ -206,12 +206,15 @@ ${extensions}`;
|
||||||
* @returns {string}
|
* @returns {string}
|
||||||
*/
|
*/
|
||||||
function formatDate (dateStr) {
|
function formatDate (dateStr) {
|
||||||
return dateStr[4] + dateStr[5] + "/" +
|
if (dateStr.length === 13) { // UTC Time
|
||||||
dateStr[2] + dateStr[3] + "/" +
|
dateStr = (dateStr[0] < "5" ? "20" : "19") + dateStr;
|
||||||
dateStr[0] + dateStr[1] + " " +
|
}
|
||||||
dateStr[6] + dateStr[7] + ":" +
|
return dateStr[6] + dateStr[7] + "/" +
|
||||||
|
dateStr[4] + dateStr[5] + "/" +
|
||||||
|
dateStr[0] + dateStr[1] + dateStr[2] + dateStr[3] + " " +
|
||||||
dateStr[8] + dateStr[9] + ":" +
|
dateStr[8] + dateStr[9] + ":" +
|
||||||
dateStr[10] + dateStr[11];
|
dateStr[10] + dateStr[11] + ":" +
|
||||||
|
dateStr[12] + dateStr[13];
|
||||||
}
|
}
|
||||||
|
|
||||||
export default ParseX509Certificate;
|
export default ParseX509Certificate;
|
||||||
|
|
Loading…
Reference in a new issue