Prepare to rename project into hashcat

This release markes the fusion of "hashcat" and "oclHashcat" into "hashcat".
It combines all features of all hashcat projects in one project.

.gitignore

@@ -1,7 +1,7 @@
 *.exe
 *.bin
 *.app
-oclHashcat
+hashcat
 *.restore
 *.dictstat
 *.pot
@@ -11,3 +11,4 @@ deps/**
 kernels/**
 lib/*.a
 obj/*.o
+include/CL

OpenCL/kernel_serpent256.c

@@ -14,7 +14,7 @@
 /*                                                                      */
 /* -------------------------------------------------------------------- */
 /*                                                                      */
-/* Cleaned and optimized for GPU use with oclHashcat by Jens Steube     */
+/* Cleaned and optimized for GPU use with hashcat by Jens Steube        */
 
 /* 15 terms */
 

OpenCL/kernel_twofish256.c

@@ -17,7 +17,7 @@
 /*                                                                      */
 /* -------------------------------------------------------------------- */
 /*                                                                      */
-/* Cleaned and optimized for GPU use with oclHashcat by Jens Steube     */
+/* Cleaned and optimized for GPU use with hashcat by Jens Steube        */
 
 #define extract_byte(x,n) (((x) >> (8 * (n))) & 0xff)
 

OpenCL/m10700.cl

@@ -1176,7 +1176,7 @@ void memcat8 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const
 #define WORDSZ384   128
 #define WORDSZ512   128
 
-#define PWMAXSZ     32        // oclHashcat password length limit
+#define PWMAXSZ     32        // hashcat password length limit
 #define BLMAXSZ     BLSZ512
 #define WORDMAXSZ   WORDSZ512
 

README.md

@@ -1,22 +1,24 @@
-## *oclHashcat* ##
+## *hashcat* ##
 
-**oclHashcat** is the world's fastest and most advanced GPGPU-based password recovery utility, supporting five unique modes of attack for over 170 highly-optimized hashing algorithms. oclHashcat currently supports AMD (OpenCL) and Nvidia (CUDA) graphics processors on GNU/Linux and Windows 7/8/10, and has facilities to help enable distributed password cracking.
+**hashcat** is the world's fastest and most advanced password recovery utility, supporting five unique modes of attack for over 180 highly-optimized hashing algorithms. hashcat currently supports CPU's, GPU's other hardware-accelerators on Linux, Windows and OSX, and has facilities to help enable distributed password cracking.
+
+** THE VERSION 3.00 IS CURRENTLY STILL IN BETA **
 
 ### License ###
 
-**oclHashcat** is licensed under the MIT license. Refer to [docs/license.txt](docs/license.txt) for more information. 
+**hashcat** is licensed under the MIT license. Refer to [docs/license.txt](docs/license.txt) for more information. 
 
 ### Installation ###
 
-Download the [latest release](https://hashcat.net/oclhashcat/) and unpack it in the desired location. Please remember to use `7z x` when unpacking the archive from the command line to ensure full file paths remain intact.
+Download the [latest release](https://hashcat.net/hashcat/) and unpack it in the desired location. Please remember to use `7z x` when unpacking the archive from the command line to ensure full file paths remain intact.
 
 ### Usage/Help ###
 
 Please refer to the [Hashcat Wiki](https://hashcat.net/wiki/) and the output of `--help` for usage information and general help. A list of frequently asked questions may also be found [here](https://hashcat.net/wiki/doku.php?id=frequently_asked_questions). The [Hashcat Forums](https://hashcat.net/forum/) also contain a plethora of information. 
 
 ### Building ###
 
-Refer to [docs/BUILD.md](docs/BUILD.md) for instructions on how to build **oclHashcat** from source.
+Refer to [docs/BUILD.md](docs/BUILD.md) for instructions on how to build **hashcat** from source.
 
 ### Contributing ###
 
@@ -41,8 +43,8 @@ Your pull request should fully describe the functionality you are adding/removin
 
 Solve only one problem in each pull request. If you're fixing a bug and adding a new feature, you need to make two separate pull requests. If you're fixing three bugs, you need to make three separate pull requests. If you're adding four new features, you need to make four separate pull requests. So on, and so forth.
 
-If your patch fixes a bug, please be sure there is an [issue](https://github.com/hashcat/oclHashcat/issues) open for the bug before submitting a pull request. If your patch aims to improve performance or optimizes an algorithm, be sure to quantify your optimizations and document the trade-offs, and back up your claims with benchmarks and metrics.
+If your patch fixes a bug, please be sure there is an [issue](https://github.com/hashcat/hashcat/issues) open for the bug before submitting a pull request. If your patch aims to improve performance or optimizes an algorithm, be sure to quantify your optimizations and document the trade-offs, and back up your claims with benchmarks and metrics.
 
-In order to maintain the quality and integrity of the **oclHashcat** source tree, all pull requests must be reviewed and signed off by at least two [board members](https://github.com/orgs/hashcat/people) before being merged. The [project lead](https://github.com/jsteube) has the ultimate authority in deciding whether to accept or reject a pull request. Do not be discouraged if your pull request is rejected!
+In order to maintain the quality and integrity of the **hashcat** source tree, all pull requests must be reviewed and signed off by at least two [board members](https://github.com/orgs/hashcat/people) before being merged. The [project lead](https://github.com/jsteube) has the ultimate authority in deciding whether to accept or reject a pull request. Do not be discouraged if your pull request is rejected!
 
 ### Happy Cracking!

docs/BUILD.md

@@ -1,4 +1,4 @@
-oclHashcat build documentation
+hashcat build documentation
 =
 # Revision:
 * 1.3
@@ -8,12 +8,12 @@ oclHashcat build documentation
 * Christoph Heuwieser <<dropdead@hashcat.net>>
 * magnum <<john.magnum@hushmail.com>>
 
-# Building oclHashcat for Linux and OSX
+# Building hashcat for Linux and OSX
 
-Get a copy of the **oclHashcat** repository
+Get a copy of the **hashcat** repository
 
 ```sh
-$ git clone https://github.com/hashcat/oclHashcat.git
+$ git clone https://github.com/hashcat/hashcat.git
 ```
 
 Run "make"
@@ -22,7 +22,7 @@ Run "make"
 $ make
 ```
 
-# Install oclHashcat for Linux
+# Install hashcat for Linux
 
 The install target is linux FHS compatible and can be used like this:
 
@@ -32,12 +32,12 @@ $ make install
 
 If you install it, cached kernels, session files, restore- and pot-files etc. will go to $HOME/.hashcat/
 
-# Building oclHashcat for Windows
+# Building hashcat for Windows
 
-Get a copy of the **oclHashcat** repository
+Get a copy of the **hashcat** repository
 
 ```sh
-$ git clone https://github.com/hashcat/oclHashcat.git
+$ git clone https://github.com/hashcat/hashcat.git
 ```
 
 Basically all you need is the OpenCL Headers.
@@ -53,4 +53,4 @@ $ git clone https://github.com/KhronosGroup/OpenCL-Headers deps/OpenCL-Headers/C
 $ make win32 win64
 ```
 =
-Enjoy your fresh **oclHashcat** binaries ;)
+Enjoy your fresh **hashcat** binaries ;)

docs/changes.txt

@@ -3,7 +3,7 @@
 This release markes the fusion of "hashcat" and "oclHashcat" into "hashcat".
 It combines all features of all hashcat projects in one project.
 
-** NOTE to beta users: that's what's planed for release **
+** THE VERSION 3.00 IS CURRENTLY STILL IN BETA **
 
 ##
 ## Features

docs/readme.txt

@@ -1,5 +1,7 @@
-oclHashcat v2.10
-================
+hashcat v3.00
+=============
+
+** THE VERSION 3.00 IS CURRENTLY STILL IN BETA **
 
 AMD users require AMD drivers 14.9 or later (recommended 15.12 or later)
 Intel users require Intel OpenCL Runtime 14.2 or later (recommended 15.1 or later)
@@ -10,11 +12,11 @@ NVidia users require NVidia drivers 346.59 or later (recommended 361.x or later)
 ##
 
 - World's fastest password cracker
-- World's first and only GPGPU-based rule engine
+- World's first and only in-kernel rule engine
 - Free
 - Open-Source (MIT License)
 - Multi-OS (Linux, Windows and OSX)
-- Multi-Platform (CPU, GPU, FPGA, etc., everything that comes with an OpenCL runtime)
+- Multi-Platform (CPU, GPU, DSP, FPGA, etc., everything that comes with an OpenCL runtime)
 - Multi-Hash (Cracking multiple hashes at the same time)
 - Multi-Devices (Utilizing multiple devices in same system)
 - Multi-Device-Types (Utilizing mixed device types in same system)
@@ -28,7 +30,7 @@ NVidia users require NVidia drivers 346.59 or later (recommended 361.x or later)
 - Supports automatic keyspace ordering markov-chains
 - Built-in benchmarking system
 - Integrated thermal watchdog
-- 150+ Hash-types implemented with performance in mind
+- 160+ Hash-types implemented with performance in mind
 
 ##
 ## Hash-Types
@@ -222,3 +224,15 @@ NVidia users require NVidia drivers 346.59 or later (recommended 361.x or later)
 - Mesa/Clover
 - NVidia ForceWare
 - pocl
+
+##
+## Supported OpenCL device types
+##
+
+- GPU
+- CPU 
+- APU
+- DSP
+- FPGA
+- Coprocessor
+

docs/rules.txt

@@ -42,7 +42,7 @@
 #define RULE_OP_REJECT_CONTAINS         '%' // reject plains that contain char X less than N times
 #define RULE_OP_REJECT_MEMORY           'Q' // reject plains that match the plain saved (see M), i.e. if unchanged
 
-/* hashcat only */
+/* With -j or -k only */
 
 #define RULE_OP_MANGLE_SWITCH_FIRST     'k' // switches the first 2 chars. ex: hello -> ehllo
 #define RULE_OP_MANGLE_SWITCH_LAST      'K' // switches the last 2 chars.  ex: hello -> helol
@@ -56,3 +56,4 @@
 #define RULE_OP_MANGLE_DUPEBLOCK_FIRST  'y' // duplicates first n characters
 #define RULE_OP_MANGLE_DUPEBLOCK_LAST   'Y' // duplicates last n characters
 #define RULE_OP_MANGLE_TITLE            'E' // lowercase everything then upper case the first letter and every letter after a space
+