Upgrade AMD Display Library SDK from 8.0 to 9.0

diff --git a/docs/BUILD.md b/docs/BUILD.md
index db71fb4..49a3828 100644 (file)
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -1,7 +1,7 @@
 oclHashcat build documentation
 =
 # Revision:
-* 1.1
+* 1.2
 
 # Authors:
 * Gabriele Gristina <<matrix@hashcat.net>>
@@ -11,7 +11,7 @@ oclHashcat build documentation
 
 To compile **oclHashcat** the following third party libraries are required:
 
-- ADL_SDK v8.0 ( http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/ )
+- ADL_SDK v9.0 ( http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/ )
 - NVAPI R352 ( https://developer.nvidia.com/nvapi )
 - GDK v352_55 ( https://developer.nvidia.com/gpu-deployment-kit )
 
@@ -19,7 +19,7 @@ The next thing to do is download all the third party libraries listed above and
 
 The following files are needed inside the *deps/tmp* directory:
     
-    ADL_SDK8.zip
+    ADL_SDK9.zip
     R352-developer.zip
     gdk_linux_amd64_352_55_release.run
     
@@ -29,11 +29,11 @@ First get a copy of the **oclHashcat** repository
 ```sh
 $ git clone https://github.com/hashcat/oclHashcat.git
 ```
-Install the dependencies
+Install the dependencies (root permission needed)
 
 ```sh
 $ cd oclHashcat
-$ sudo ./tools/deps.sh
+$ ./tools/deps.sh
 ```
 
 Run "make"
@@ -49,6 +49,11 @@ $ make install
 ```
 
 Useful tricks:
+- build native linux/osx binaries
+```sh
+$ make
+```
+
 - build all binaries (see Note1 and Note2):
 ```sh
 $ make binaries

diff --git a/tools/deps.sh b/tools/deps.sh
index 026db51..52745fc 100755 (executable)
--- a/tools/deps.sh
+++ b/tools/deps.sh
@@ -3,9 +3,9 @@
 # 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"
+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"
-DOWNLOAD_DEPS="ADL_SDK8.zip R352-developer.zip gdk_linux_amd64_352_55_release.run"
+DOWNLOAD_DEPS="ADL_SDK9.zip R352-developer.zip gdk_linux_amd64_352_55_release.run"
 
 ## enter the deps directory
 cur_directory=$(dirname ${0})
@@ -45,13 +45,7 @@ for pkg in ${DEPS}; do
   # check if the package is already installed
   dpkg -s ${pkg} &>/dev/null
   if [ $? -ne 0 ]; then
-    ## root check
-    if [ $(id -u) -ne 0 ]; then
-      echo "! Must be root to install the required package '${pkg}' with apt-get"
-      exit 1
-    fi
-
-    apt-get -y install ${pkg}
+    sudo apt-get -y install ${pkg}
     if [ $? -ne 0 ]; then
       echo "! failed to install ${pkg}"
       exit 1
@@ -60,7 +54,7 @@ for pkg in ${DEPS}; do
 done
 
 ## extract ADL SDK
-unzip ADL_SDK8.zip -d ${deps_dir}/adl-sdk-8
+unzip ADL_SDK9.zip -d ${deps_dir}/adl-sdk-9
 ret=$?
 
 if [[ ${ret} -ne 0 ]] && [[ ${ret} -ne 1 ]]; then
@@ -68,7 +62,7 @@ if [[ ${ret} -ne 0 ]] && [[ ${ret} -ne 1 ]]; then
   exit 1
 fi
 
-rm -rf ${deps_dir}/adl-sdk && ln -s ${deps_dir}/adl-sdk-8 ${deps_dir}/adl-sdk
+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"
@@ -98,13 +92,7 @@ fi
 ls /usr/lib/*/libOpenCL.so &> /dev/null
 
 if [ $? -ne 0 ]; then
-  ## root check
-  if [ $(id -u) -ne 0 ]; then
-    echo "! Must be root to install '${DEPS_AMD_DEV}'"
-    exit 1
-  fi
-
-  apt-get -y install ${DEPS_AMD_DEV}
+  sudo apt-get -y install ${DEPS_AMD_DEV}
   if [ $? -ne 0 ]; then
     echo "! failed to install ${DEPS_AMD_DEV}"
     exit 1