Mirror
/
CyberChef
mirror of https://github.com/gchq/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'filetimemod' of https://github.com/bwhitn/CyberChef into bwhitn-filetimemod

This commit is contained in:
n1474335 2017-07-03 15:19:42 +00:00
parent 61c799447b ad25daf206
commit e7cea889ab
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/config/OperationConfig.js
View File

@ -2301,6 +2301,11 @@ const OperationConfig = {
name: "Output units",
type: "option",
value: DateTime.UNITS
},
{
name: "Input Format",
type: "option",
value: DateTime.FILETIME_FORMATS
}
]
},
@ -2314,6 +2319,11 @@ const OperationConfig = {
name: "Input units",
type: "option",
value: DateTime.UNITS
},
{
name: "Output Format",
type: "option",
value: DateTime.FILETIME_FORMATS
}
]
},

23
src/core/operations/DateTime.js
View File

@ -90,7 +90,13 @@ const DateTime = {
*/
runFromFiletimeToUnix: function(input, args) {
let units = args[0];
input = new BigInteger(input).subtract(new BigInteger("116444736000000000"));
let format = args[1];
if (format === "Hex") {
input = new BigInteger(input, 16);
} else {
input = new BigInteger(input);
}
input = input.subtract(new BigInteger("116444736000000000"));
if (units === "Seconds (s)"){
input = input.divide(new BigInteger("10000000"));
} else if (units === "Milliseconds (ms)") {
@ -116,6 +122,7 @@ const DateTime = {
*/
runToFiletimeFromUnix: function(input, args) {
let units = args[0];
let format = args[1];
input = new BigInteger(input);
if (units === "Seconds (s)"){
input = input.multiply(new BigInteger("10000000"));
@ -128,10 +135,22 @@ const DateTime = {
} else {
throw "Unrecognised unit";
}
return input.add(new BigInteger("116444736000000000")).toString();
input = input.add(new BigInteger("116444736000000000"));
if (format === "Hex"){
return input.toString(16);
} else {
return input.toString();
}
},
/**
* @constant
* @default
*/
FILETIME_FORMATS: ["Decimal", "Hex"],
/**
* @constant
* @default