Merge pull request #21 from magnumripper/ec

Add an .editorconfig file enforcing some of the code style.

diff --git a/docs/BUILD.md b/docs/BUILD.md
index fbfb816..4cb368d 100644 (file)
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -34,7 +34,7 @@ The following files are needed inside the *deps/tmp* directory:
     gdk_linux_amd64_352_55_release.run
     AMD-APP-SDKInstaller-v3.0.130.135-GA-linux64.tar.bz2
 
-Now just execute the following script to complete the installation of dependencies (check for an updated version in **docs/deps.sh**):
+Now just execute the following script to complete the installation of dependencies (check for an updated version in **tools/deps.sh**):
 
     #!/bin/bash
     # Author: Gabriele Gristina <matrix@hashcat.net>

diff --git a/docs/changes.txt b/docs/changes.txt
index 48cb27b..2f99087 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -5,6 +5,15 @@ File.: Host
 Desc.: Implemented a new feature that allows to quit at next restore point update (and disable it)
 Issue: 10
 
+Type.: Bug
+File.: Host
+Desc.: Fixed a bug in combination of --restore and a user immediately aborting the session after restart
+Trac.: 684
+
+Type.: Change
+File.: Docs
+Desc.: Updated docs/readme.txt -- Starting with v2.01 OpenCL 2.00 is required; we need Catalyst 15.7 or higher
+
 * changes v2.00 -> v2.01:
 
 Type.: Bug

diff --git a/docs/readme.txt b/docs/readme.txt
index 7866da0..bf03f20 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -2,7 +2,7 @@ oclHashcat v2.00
 ================
 
 NV users require ForceWare 346.59 or later
-AMD users require Catalyst 14.9 or later
+AMD users require Catalyst 15.7 or later
 
 ##
 ## Features

diff --git a/src/shared.c b/src/shared.c
index 48a1f1d..823298b 100644 (file)
--- a/src/shared.c
+++ b/src/shared.c
@@ -8747,6 +8747,14 @@ uint64_t get_lowest_words_done ()
     if (words_done < words_cur) words_cur = words_done;
   }
 
+  // It's possible that a GPU's workload isn't finished right after a restore-case.
+  // In that case, this function would return 0 and overwrite the real restore point
+  // There's also data.words_cur which is set to rd->words_cur but it changes while
+  // the attack is running therefore we should stick to rd->words_cur.
+  // Note that -s influences rd->words_cur we should keep a close look on that.
+
+  if (words_cur < data.rd->words_cur) words_cur = data.rd->words_cur;
+
   return words_cur;
 }