From: Jens Steube <jens.steube@gmail.com>
Date: Fri, 8 Jul 2016 12:39:15 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/hashcat/hashcat
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=d77c63a12c08cc587e420b2196bdb32bfee1ad5a;hp=-c;p=hashcat.git

Merge branch 'master' of https://github.com/hashcat/hashcat
---

d77c63a12c08cc587e420b2196bdb32bfee1ad5a
diff --combined src/hashcat.c
index 67714d1,b7bdff0..ca691a9
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@@ -6,7 -6,7 +6,7 @@@
   * License.....: MIT
   */
  
- #ifdef DARWIN
+ #if defined(DARWIN) || defined(__FreeBSD__)
  #include <stdio.h>
  #endif
  
@@@ -6171,7 -6171,8 +6171,8 @@@ int main (int argc, char **argv
  
    char *exec_path = get_exec_path ();
  
-   #if defined(LINUX) || defined(__APPLE__)
+ 
+   #if defined(LINUX) || defined(__APPLE__) || defined(__FreeBSD__)
  
    char *resolved_install_folder = realpath (INSTALL_FOLDER, NULL);
    char *resolved_exec_path      = realpath (exec_path, NULL);
@@@ -13017,6 -13018,7 +13018,7 @@@
                    // here we have in line_buf: ESSID:MAC1:MAC2   (without the plain)
                    // manipulate salt_buf
  
+                   memset (line_buf_cpy, 0, HCBUFSIZ);
                    memcpy (line_buf_cpy, line_buf, i);
  
                    char *mac2_pos = strrchr (line_buf_cpy, ':');
@@@ -15034,13 -15036,7 +15036,13 @@@
         * create context for each device
         */
  
 -      device_param->context = hc_clCreateContext (data.ocl, NULL, 1, &device_param->device, NULL, NULL);
 +      cl_context_properties properties[3];
 +
 +      properties[0] = CL_CONTEXT_PLATFORM;
 +      properties[1] = (cl_context_properties) device_param->platform;
 +      properties[2] = 0;
 +
 +      device_param->context = hc_clCreateContext (data.ocl, properties, 1, &device_param->device, NULL, NULL);
  
        /**
         * create command-queue