mirror of
https://github.com/gchq/CyberChef.git
synced 2025-04-23 16:26:16 -04:00
Tidied up Citrix CTX1 operations and updated CHANGELOG
This commit is contained in:
parent
1653d0212a
commit
79d7a5dd87
5 changed files with 25 additions and 19 deletions
|
@ -68,8 +68,6 @@
|
|||
"Blowfish Decrypt",
|
||||
"DES Encrypt",
|
||||
"DES Decrypt",
|
||||
"Citrix CTX1 Encode",
|
||||
"Citrix CTX1 Decode",
|
||||
"Triple DES Encrypt",
|
||||
"Triple DES Decrypt",
|
||||
"RC2 Encrypt",
|
||||
|
@ -97,6 +95,8 @@
|
|||
"JWT Sign",
|
||||
"JWT Verify",
|
||||
"JWT Decode",
|
||||
"Citrix CTX1 Encode",
|
||||
"Citrix CTX1 Decode",
|
||||
"Pseudo-Random Number Generator"
|
||||
]
|
||||
},
|
||||
|
|
|
@ -1,25 +1,26 @@
|
|||
/**
|
||||
* @author bwhitn [brian.m.whitney@gmail.com]
|
||||
* @copyright Crown Copyright 2017
|
||||
* @copyright Crown Copyright 2018
|
||||
* @license Apache-2.0
|
||||
*/
|
||||
|
||||
import Operation from "../Operation";
|
||||
import OperationError from "../errors/OperationError";
|
||||
import cptable from "../vendor/js-codepage/cptable.js";
|
||||
|
||||
/**
|
||||
* Encode Citrix CTX1 class
|
||||
* Citrix CTX1 Decode operation
|
||||
*/
|
||||
class DecodeCitrixCTX1 extends Operation {
|
||||
class CitrixCTX1Decode extends Operation {
|
||||
|
||||
/**
|
||||
* EncodeCitrixCTX1 constructor
|
||||
* CitrixCTX1Decode constructor
|
||||
*/
|
||||
constructor() {
|
||||
super();
|
||||
|
||||
this.name = "Citrix CTX1 Decode";
|
||||
this.module = "Ciphers";
|
||||
this.module = "Encodings";
|
||||
this.description = "Decodes strings in a Citrix CTX1 password format to plaintext.";
|
||||
this.infoURL = "https://www.reddit.com/r/AskNetsec/comments/1s3r6y/citrix_ctx1_hash_decoding/";
|
||||
this.inputType = "byteArray";
|
||||
|
@ -34,13 +35,13 @@ class DecodeCitrixCTX1 extends Operation {
|
|||
*/
|
||||
run(input, args) {
|
||||
if (input.length % 4 !== 0) {
|
||||
return "";
|
||||
throw new OperationError("Incorrect hash length");
|
||||
}
|
||||
const revinput = input.reverse();
|
||||
const result = [];
|
||||
let temp = 0;
|
||||
for (let i = 0; i < revinput.length; i+=2) {
|
||||
if (i+2 >= revinput.length) {
|
||||
for (let i = 0; i < revinput.length; i += 2) {
|
||||
if (i + 2 >= revinput.length) {
|
||||
temp = 0;
|
||||
} else {
|
||||
temp = ((revinput[i + 2] - 0x41) & 0xf) ^ (((revinput[i + 3]- 0x41) << 4) & 0xf0);
|
||||
|
@ -54,4 +55,4 @@ class DecodeCitrixCTX1 extends Operation {
|
|||
|
||||
}
|
||||
|
||||
export default DecodeCitrixCTX1;
|
||||
export default CitrixCTX1Decode;
|
|
@ -1,6 +1,6 @@
|
|||
/**
|
||||
* @author bwhitn [brian.m.whitney@gmail.com]
|
||||
* @copyright Crown Copyright 2017
|
||||
* @copyright Crown Copyright 2018
|
||||
* @license Apache-2.0
|
||||
*/
|
||||
|
||||
|
@ -8,18 +8,18 @@ import Operation from "../Operation";
|
|||
import cptable from "../vendor/js-codepage/cptable.js";
|
||||
|
||||
/**
|
||||
* Encode Citrix CTX1 class
|
||||
* Citrix CTX1 Encode operation
|
||||
*/
|
||||
class EncodeCitrixCTX1 extends Operation {
|
||||
class CitrixCTX1Encode extends Operation {
|
||||
|
||||
/**
|
||||
* EncodeCitrixCTX1 constructor
|
||||
* CitrixCTX1Encode constructor
|
||||
*/
|
||||
constructor() {
|
||||
super();
|
||||
|
||||
this.name = "Citrix CTX1 Encode";
|
||||
this.module = "Ciphers";
|
||||
this.module = "Encodings";
|
||||
this.description = "Encodes strings to Citrix CTX1 password format.";
|
||||
this.infoURL = "https://www.reddit.com/r/AskNetsec/comments/1s3r6y/citrix_ctx1_hash_decoding/";
|
||||
this.inputType = "string";
|
||||
|
@ -33,7 +33,7 @@ class EncodeCitrixCTX1 extends Operation {
|
|||
* @returns {byteArray}
|
||||
*/
|
||||
run(input, args) {
|
||||
const utf16pass = Buffer.from(cptable.utils.encode(1200, input));
|
||||
const utf16pass = Array.from(cptable.utils.encode(1200, input));
|
||||
const result = [];
|
||||
let temp = 0;
|
||||
for (let i = 0; i < utf16pass.length; i++) {
|
||||
|
@ -47,4 +47,4 @@ class EncodeCitrixCTX1 extends Operation {
|
|||
|
||||
}
|
||||
|
||||
export default EncodeCitrixCTX1;
|
||||
export default CitrixCTX1Encode;
|
Loading…
Add table
Add a link
Reference in a new issue