mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-05-14 01:56:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

5
src/js/config/Categories.js
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",
]