Mirrors/CyberChef
2
0
Fork 0
mirror of https://github.com/gchq/CyberChef synced 2024-11-15 09:07:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'artemisbot-bug/uuid'

Browse source
This commit is contained in:
n1474335 2017-12-19 14:24:59 +00:00
commit 8c29ce95e2
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/config/modules/Default.js
View file

@ -39,6 +39,7 @@ import UUID from "../../operations/UUID.js";
* - Utils.js * - Utils.js
* - CryptoJS * - CryptoJS
* - otp * - otp
* - crypto
* *
* @author n1474335 [n1474335@gmail.com] * @author n1474335 [n1474335@gmail.com]
* @copyright Crown Copyright 2017 * @copyright Crown Copyright 2017

19
src/core/operations/UUID.js
View file

@ -1,3 +1,6 @@
import crypto from "crypto";
/** /**
* UUID operations. * UUID operations.
* *
@ -17,25 +20,17 @@ const UUID = {
* @returns {string} * @returns {string}
*/ */
runGenerateV4: function(input, args) { runGenerateV4: function(input, args) {
if (window && typeof(window.crypto) !== "undefined" && typeof(window.crypto.getRandomValues) !== "undefined") { const buf = new Uint32Array(4).map(() => {
let buf = new Uint32Array(4), return crypto.randomBytes(4).readUInt32BE(0, true);
i = 0; });
window.crypto.getRandomValues(buf); let i = 0;
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) { return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
let r = (buf[i >> 3] >> ((i % 8) * 4)) & 0xf, let r = (buf[i >> 3] >> ((i % 8) * 4)) & 0xf,
v = c === "x" ? r : (r & 0x3 | 0x8); v = c === "x" ? r : (r & 0x3 | 0x8);
i++; i++;
return v.toString(16); return v.toString(16);
}); });
} else {
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
let r = Math.random() * 16 | 0,
v = c === "x" ? r : (r & 0x3 | 0x8);
return v.toString(16);
});
} }
},
}; };
export default UUID; export default UUID;