More cleanup

diff --git a/OpenCL/common.c b/OpenCL/common.c
index 23580ab..18e67a4 100644 (file)
--- a/OpenCL/common.c
+++ b/OpenCL/common.c
@@ -2033,7 +2033,7 @@ static void append_0x02_4x4 (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], const u
 }
 
 // before: append_0x02_8
-static void append_0x02_8 (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 w4[4], u32 w5[4], u32 w6[4], u32 w7[4], const u32 offset)
+static void append_0x02_8x4 (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 w4[4], u32 w5[4], u32 w6[4], u32 w7[4], const u32 offset)
 {
   switch (offset)
   {

diff --git a/cudaExample0.cmd b/cudaExample0.cmd
deleted file mode 100644 (file)
index ace7147..0000000
--- a/cudaExample0.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-cudaHashcat64.exe -t 32 -a 7 example0.hash ?a?a?a?a example.dict\r
-pause\r

diff --git a/cudaExample0.sh b/cudaExample0.sh
deleted file mode 100755 (executable)
index 38e5fd1..0000000
--- a/cudaExample0.sh
+++ /dev/null
@@ -1 +0,0 @@
-./cudaHashcat64.bin -t 32 -a 7 example0.hash ?a?a?a?a example.dict

diff --git a/cudaExample400.cmd b/cudaExample400.cmd
deleted file mode 100644 (file)
index b80b25e..0000000
--- a/cudaExample400.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-type example.dict | cudaHashcat64.exe -m 400 example400.hash\r
-pause\r

diff --git a/cudaExample400.sh b/cudaExample400.sh
deleted file mode 100755 (executable)
index c2f0434..0000000
--- a/cudaExample400.sh
+++ /dev/null
@@ -1 +0,0 @@
-cat example.dict | ./cudaHashcat64.bin -m 400 example400.hash

diff --git a/cudaExample500.cmd b/cudaExample500.cmd
deleted file mode 100644 (file)
index 6274087..0000000
--- a/cudaExample500.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-cudaHashcat64.exe -m 500 example500.hash example.dict\r
-pause\r

diff --git a/cudaExample500.sh b/cudaExample500.sh
deleted file mode 100755 (executable)
index e5b11fc..0000000
--- a/cudaExample500.sh
+++ /dev/null
@@ -1 +0,0 @@
-./cudaHashcat64.bin -m 500 example500.hash example.dict

diff --git a/docs/BUILD.md b/docs/BUILD.md
index 4cb368d..c192781 100644 (file)
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -197,14 +197,6 @@ $ make linux
 ```sh
 $ make windows
 ```
-- build only *AMD kernel* binaries
-```sh
-$ make amd_all
-```
-- build only *NVIDIA kernel* binaries
-```sh
-$ make nv_all
-```
 
 =
 Enjoy your fresh **oclHashcat** binaries ;)

diff --git a/docs/readme.txt b/docs/readme.txt
index 7866da0..fedba9d 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -15,7 +15,7 @@ AMD users require Catalyst 14.9 or later
 - Multi-GPU (up to 128 GPUs)
 - Multi-Hash (up to 100 million hashes at once)
 - Multi-OS (Linux & Windows native binaries)
-- Multi-Platform (OpenCL & CUDA support)
+- Multi-Platform (OpenCL support)
 - Multi-Algorithm (see below)
 - Low resource utilization; you can still watch movies or play games while cracking
 - Focuses on highly iterated modern hashes

diff --git a/example0.cmd b/example0.cmd
new file mode 100644 (file)
index 0000000..7b948c1
--- /dev/null
+++ b/example0.cmd
@@ -0,0 +1,2 @@
+oclHashcat64.exe -t 32 -a 7 example0.hash ?a?a?a?a example.dict\r
+pause\r

diff --git a/example0.sh b/example0.sh
new file mode 100755 (executable)
index 0000000..8227431
--- /dev/null
+++ b/example0.sh
@@ -0,0 +1 @@
+./oclHashcat64.bin -t 32 -a 7 example0.hash ?a?a?a?a example.dict

diff --git a/example400.cmd b/example400.cmd
new file mode 100644 (file)
index 0000000..0c12ffa
--- /dev/null
+++ b/example400.cmd
@@ -0,0 +1,2 @@
+type example.dict | oclHashcat64.exe -m 400 example400.hash\r
+pause\r

diff --git a/example400.sh b/example400.sh
new file mode 100755 (executable)
index 0000000..e0c4dc1
--- /dev/null
+++ b/example400.sh
@@ -0,0 +1 @@
+cat example.dict | ./oclHashcat64.bin -m 400 example400.hash

diff --git a/example500.cmd b/example500.cmd
new file mode 100644 (file)
index 0000000..24531c7
--- /dev/null
+++ b/example500.cmd
@@ -0,0 +1,2 @@
+oclHashcat64.exe -m 500 example500.hash example.dict\r
+pause\r

diff --git a/example500.sh b/example500.sh
new file mode 100755 (executable)
index 0000000..40be27c
--- /dev/null
+++ b/example500.sh
@@ -0,0 +1 @@
+./oclHashcat64.bin -m 500 example500.hash example.dict

diff --git a/oclExample0.cmd b/oclExample0.cmd
deleted file mode 100644 (file)
index 7b948c1..0000000
--- a/oclExample0.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-oclHashcat64.exe -t 32 -a 7 example0.hash ?a?a?a?a example.dict\r
-pause\r

diff --git a/oclExample0.sh b/oclExample0.sh
deleted file mode 100755 (executable)
index 8227431..0000000
--- a/oclExample0.sh
+++ /dev/null
@@ -1 +0,0 @@
-./oclHashcat64.bin -t 32 -a 7 example0.hash ?a?a?a?a example.dict

diff --git a/oclExample400.cmd b/oclExample400.cmd
deleted file mode 100644 (file)
index 0c12ffa..0000000
--- a/oclExample400.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-type example.dict | oclHashcat64.exe -m 400 example400.hash\r
-pause\r

diff --git a/oclExample400.sh b/oclExample400.sh
deleted file mode 100755 (executable)
index e0c4dc1..0000000
--- a/oclExample400.sh
+++ /dev/null
@@ -1 +0,0 @@
-cat example.dict | ./oclHashcat64.bin -m 400 example400.hash

diff --git a/oclExample500.cmd b/oclExample500.cmd
deleted file mode 100644 (file)
index 24531c7..0000000
--- a/oclExample500.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-oclHashcat64.exe -m 500 example500.hash example.dict\r
-pause\r

diff --git a/oclExample500.sh b/oclExample500.sh
deleted file mode 100755 (executable)
index 40be27c..0000000
--- a/oclExample500.sh
+++ /dev/null
@@ -1 +0,0 @@
-./oclHashcat64.bin -m 500 example500.hash example.dict

diff --git a/tools/package_nv.sh b/tools/package_nv.sh
deleted file mode 100755 (executable)
index 09042c4..0000000
--- a/tools/package_nv.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-##
-## Author......: Jens Steube <jens.steube@gmail.com>
-## License.....: MIT
-##
-
-export IN=$HOME/oclHashcat
-export OUT=$HOME/xy/cudaHashcat-2.01
-
-rm -rf $OUT
-rm -rf $OUT.7z
-
-mkdir -p $OUT $OUT/kernels $OUT/kernels/4318
-
-cp    $IN/cudaHashcat??.exe                     $OUT/
-cp    $IN/cudaHashcat??.bin                     $OUT/
-cp    $IN/hashcat.hcstat                        $OUT/
-
-cp -r $IN/docs                                  $OUT/
-cp -r $IN/charsets                              $OUT/
-cp -r $IN/masks                                 $OUT/
-cp -r $IN/rules                                 $OUT/
-cp -r $IN/extra                                 $OUT/
-cp    $IN/example.dict                          $OUT/
-cp    $IN/example[0123456789]*.hash             $OUT/
-cp    $IN/cudaExample[0123456789]*.sh           $OUT/
-cp    $IN/cudaExample[0123456789]*.cmd          $OUT/
-
-cp -r $IN/kernels/4318/*.cubin                  $OUT/kernels/4318/
-
-dos2unix $OUT/rules/*.rule
-dos2unix $OUT/rules/hybrid/*.rule
-dos2unix $OUT/docs/*
-dos2unix $OUT/example*
-dos2unix $OUT/*Example*.sh
-dos2unix $OUT/*Example*.cmd
-
-unix2dos $OUT/masks/*.hcmask
-unix2dos $OUT/rules/*.rule
-unix2dos $OUT/rules/hybrid/*.rule
-unix2dos $OUT/docs/*
-unix2dos $OUT/example*
-unix2dos $OUT/*Example*.cmd
-
-chmod 700 $OUT
-chmod 700 $OUT/kernels
-chmod 700 $OUT/kernels/4318
-chmod 600 $OUT/kernels/4318/*
-chmod 700 $OUT/rules
-chmod 600 $OUT/rules/*
-chmod 700 $OUT/docs
-chmod 600 $OUT/docs/*
-chmod 700 $OUT/charsets
-chmod 700 $OUT/charsets/*
-chmod 700 $OUT/masks
-chmod 600 $OUT/masks/*
-chmod 600 $OUT/example*
-chmod 600 $OUT/*Example*.cmd
-chmod 700 $OUT/*Example*.sh
-chmod 700 $OUT/extra
-chmod 700 $OUT/extra/tab_completion/*.sh
-chmod 700 $OUT/extra/tab_completion/install
-chmod 600 $OUT/extra/rules_optimize/*.exe
-chmod 700 $OUT/extra/rules_optimize/*.bin
-chmod 600 $OUT/*.exe
-chmod 700 $OUT/*.bin
-chmod 600 $OUT/hashcat.hcstat
-
-time 7z a -t7z -m0=lzma2:d28 -mx=9 -mmt=8 -ms=on $OUT.7z $OUT

diff --git a/tools/test.sh b/tools/test.sh
index 301e6ba..dd7ac28 100755 (executable)
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -1537,10 +1537,6 @@ OPTIONS:
         'all'    => all attack modes
         (int)    => attack mode integer code (default : 0)
 
-  -b    Select binary :
-        'amd'    => oclHashcat64.bin (default)
-        'nvidia' => cudaHashcat64.bin
-
   -x    Select cpu architecture :
         '32'     => 32 bit architecture
         '64'     => 64 bit architecture (default)
@@ -1612,18 +1608,6 @@ while getopts "t:m:a:b:hcpd:x:o:" opt; do
       fi
       ;;
 
-    "b")
-      if [ ${OPTARG} == "amd" ]; then
-        BIN="oclHashcat64.bin"
-        BN="amd"
-      elif [ ${OPTARG} == "nvidia" ]; then
-        BIN="cudaHashcat64.bin"
-        BN="nvidia"
-      else
-        usage
-      fi
-      ;;
-
     "c")
       OPTS="${OPTS} --markov-disable"
       MARKOV="disabled"