diff --git a/deps/.lock b/deps/.lock deleted file mode 100644 index e69de29bb..000000000 diff --git a/deps/tmp/.lock b/deps/tmp/.lock deleted file mode 100644 index e69de29bb..000000000 diff --git a/docs/BUILD.md b/docs/BUILD.md index 71b8065ba..1413982cb 100644 --- a/docs/BUILD.md +++ b/docs/BUILD.md @@ -1,7 +1,7 @@ oclHashcat build documentation = # Revision: -* 1.2 +* 1.3 # Authors: * Gabriele Gristina <> @@ -23,50 +23,33 @@ $ make # Install oclHashcat for Linux -The linux target is FHS compatible and can be installed like this: +The install target is linux FHS compatible and can be used like this: ```sh $ make install ``` -If you install it, cached kernels, session files, restore- and pot-files etc will go to $HOME/.hashcat/ +If you install it, cached kernels, session files, restore- and pot-files etc. will go to $HOME/.hashcat/ # Building oclHashcat for Windows -The following third party library is required: - -- NVAPI R352 ( https://developer.nvidia.com/nvapi ) - -Download the third party library listed above and put the .zip file into the *deps/tmp* directory. - -- R352-developer.zip - -Install the dependencies (root permission needed for apt-get install command) - Get a copy of the **oclHashcat** repository ```sh $ git clone https://github.com/hashcat/oclHashcat.git ``` -```sh -$ cd oclHashcat -$ ./tools/deps.sh -``` +Basically all you need is the OpenCL Headers. -- build all binaries: +Simply clone into the reference Implementation: ```sh -$ make win32 win64 +$ mkdir -p deps/OpenCL-Headers +$ git clone https://github.com/KhronosGroup/OpenCL-Headers deps/OpenCL-Headers/CL ``` -# To build all binaries ("make binaries") you need to first clone the OpenCL-Headers within the main folder: - ```sh -$ git clone https://github.com/KhronosGroup/OpenCL-Headers deps/OpenCL-Headers/CL +$ make win32 win64 ``` - -the tools/deps.sh script does not clone this repo automatically since for native compilation it is not needed. - = Enjoy your fresh **oclHashcat** binaries ;) diff --git a/src/Makefile b/src/Makefile index 241e3a400..1befee06c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -47,12 +47,6 @@ DOCUMENT_FOLDER ?= $(PREFIX)/share/doc/$(PROG_NAME) OPENCL_HEADERS_KHRONOS := deps/OpenCL-Headers -## -## Dependencies -## - -NVAPI := deps/R352-developer - ## WITH_ADL := 1 diff --git a/tools/deps.sh b/tools/deps.sh deleted file mode 100755 index 41a868540..000000000 --- a/tools/deps.sh +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/bash -# Author: Gabriele Gristina -# Revision: 1.03 - -## global vars -DEPS="make gcc g++ gcc-multilib g++-multilib libc6-dev-i386 mingw-w64 build-essential unzip opencl-headers ocl-icd-libopencl1 dos2unix" -DEPS_AMD_DEV="ocl-icd-opencl-dev" -## Now suppressed: ADL_SDK9.zip gdk_linux_amd64_352_55_release.run -DOWNLOAD_DEPS="R352-developer.zip" - -## enter the deps directory -cur_directory=$(dirname ${0}) -script_directory=$(cd ${cur_directory} && pwd -P) -deps_dir=${script_directory}/../deps - -mkdir -p ${deps_dir} # but it should already exist (is part of the repository) -cd ${deps_dir} - -## cleanup the directories under the 'deps' folder -rm -rf {adl-sdk*,nvidia-gdk,R352-developer} && \ -#mkdir -p {tmp,adl-sdk,nvidia-gdk,R352-developer} && \ -mkdir -p {tmp,R352-developer} && \ -cd tmp/ - -if [ $? -ne 0 ]; then - echo "! Cannot create deps directories." - exit 1 -fi - -## check dependencies -i=0 -for d in ${DOWNLOAD_DEPS}; do - if [ ! -f "${d}" ]; then - echo "! ${d} not found." - ((i++)) - fi -done - -if [ ${i} -gt 0 ]; then - echo "! Please manually download all the above dependencies to the deps/tmp/ directory" - exit 1 -fi - -## installing needed packages -for pkg in ${DEPS}; do - - # check if the package is already installed - dpkg -s ${pkg} &>/dev/null - if [ $? -ne 0 ]; then - sudo apt-get -y install ${pkg} - if [ $? -ne 0 ]; then - echo "! failed to install ${pkg}" - exit 1 - fi - fi -done - -## extract ADL SDK -#unzip ADL_SDK9.zip -d ${deps_dir}/adl-sdk-9 -#ret=$? -# -#if [[ ${ret} -ne 0 ]] && [[ ${ret} -ne 1 ]]; then -# echo "! failed to extract ADL SDK" -# exit 1 -#fi -# -#rm -rf ${deps_dir}/adl-sdk && ln -s ${deps_dir}/adl-sdk-9 ${deps_dir}/adl-sdk -# -#if [ $? -ne 0 ]; then -# echo "! failed to setup ADL SDK link" -# exit 1 -#fi - -## extract NVAPI -unzip R352-developer.zip -d ${deps_dir} -ret=$? - -if [[ ${ret} -ne 0 ]] && [[ ${ret} -ne 1 ]]; then - echo "! failed to extract NVAPI" - exit 1 -fi - -## install NVIDIA GPU Deployment Kit -#chmod +x gdk_linux_amd64_352_55_release.run && \ -#./gdk_linux_amd64_352_55_release.run --silent --installdir=${deps_dir}/nvidia-gdk -# -#if [ $? -ne 0 ]; then -# echo "! failed to install NVIDIA GPU Deployment Kit" -# exit 1 -#fi - -## check if libOpenCL.so is available (and if not install DEPS_AMD_DEV) - -ls /usr/lib/*/libOpenCL.so &> /dev/null - -if [ $? -ne 0 ]; then - sudo apt-get -y install ${DEPS_AMD_DEV} - if [ $? -ne 0 ]; then - echo "! failed to install ${DEPS_AMD_DEV}" - exit 1 - fi -fi - -echo "> oclHashcat dependencies have been resolved."