Merge remote-tracking branch 'upstream/master' into feature_xpath

# Conflicts:
#	Gruntfile.js
#	src/js/.jshintrc
This commit is contained in:
Mike Schwörer 2016-12-16 22:15:53 +01:00
commit 4c36123fd7
No known key found for this signature in database
GPG key ID: D3C7172E0A70F8CF
52 changed files with 1938 additions and 1692 deletions

View file

@ -17,7 +17,7 @@
* @constant
* @type {CatConf[]}
*/
var Categories = [
const Categories = [
{
name: "Favourites",
ops: []
@ -77,8 +77,11 @@ var Categories = [
"RC4",
"RC4 Drop",
"ROT13",
"ROT47",
"XOR",
"XOR Brute Force",
"Vigenère Encode",
"Vigenère Decode",
"Derive PBKDF2 key",
"Derive EVP key",
]

View file

@ -1,8 +1,8 @@
/*
* Tell JSHint to ignore "'Object' is not defined" errors in this file, as it references every
* Tell eslint to ignore "'Object' is not defined" errors in this file, as it references every
* single operation object by definition.
*/
/* jshint -W117 */
/* eslint no-undef: "off" */
/**
@ -45,7 +45,7 @@
* @constant
* @type {Object.<string, OpConf>}
*/
var OperationConfig = {
const OperationConfig = {
"Fork": {
description: "Split the input data up based on the specified delimiter and run all subsequent operations on each branch separately.<br><br>For example, to decode multiple Base64 strings, enter them all on separate lines then add the 'Fork' and 'From Base64' operations to the recipe. Each string will be decoded separately.",
run: FlowControl.run_fork,
@ -1325,6 +1325,36 @@ var OperationConfig = {
},
]
},
"Vigenère Encode": {
description: "The Vigenere cipher is a method of encrypting alphabetic text by using a series of different Caesar ciphers based on the letters of a keyword. It is a simple form of polyalphabetic substitution.",
run: Cipher.run_vigenere_enc,
highlight: true,
highlight_reverse: true,
input_type: "string",
output_type: "string",
args: [
{
name: "Key",
type: "string",
value: ""
}
]
},
"Vigenère Decode": {
description: "The Vigenere cipher is a method of encrypting alphabetic text by using a series of different Caesar ciphers based on the letters of a keyword. It is a simple form of polyalphabetic substitution.",
run: Cipher.run_vigenere_dec,
highlight: true,
highlight_reverse: true,
input_type: "string",
output_type: "string",
args: [
{
name: "Key",
type: "string",
value: ""
}
]
},
"Rotate right": {
description: "Rotates each byte to the right by the number of bits specified. Currently only supports 8-bit values.",
run: Rotate.run_rotr,
@ -1390,6 +1420,21 @@ var OperationConfig = {
},
]
},
"ROT47": {
description: "A slightly more complex variation of a caesar cipher, which includes ASCII characters from 33 '!' to 126 '~'. Default rotation: 47.",
run: Rotate.run_rot47,
highlight: true,
highlight_reverse: true,
input_type: "byte_array",
output_type: "byte_array",
args: [
{
name: "Amount",
type: "number",
value: Rotate.ROT47_AMOUNT
},
]
},
"Strip HTTP headers": {
description: "Removes HTTP headers from a request or response by looking for the first instance of a double newline.",
run: HTTP.run_strip_headers,
@ -2819,4 +2864,4 @@ var OperationConfig = {
output_type: "string",
args: []
}
};
};