[patch] Difference between old version of aircrack-ng-1.3.tar.gz and new version of aircrack-ng-1.3.tar.gz

aircrack-ng-1.3.tar.gz.diff (text/plain), 4.52 KB, created by Arfrever Frehtes Taifersar Arahesis on 2018-08-09 06:07:58 UTC

--- aircrack-ng-1.3/ChangeLog	2018-07-08 23:01:05.000000000 +0000
+++ aircrack-ng-1.3/ChangeLog	2018-07-11 01:27:26.000000000 +0000
@@ -1,4 +1,4 @@
-Version 1.3 beta 1 (changes from aircrack-ng 1.2) - Released XX XXX XXXX:
+Version 1.3 (changes from aircrack-ng 1.2) - Released 10 Jul 2018:
 * Aircrack-ng: Allow using Hashcat HCCAPX files as input files.
 * Aircrack-ng: Fixed floating point exception due to division by 0 when displaying stats.
 * Aircrack-ng: Updated manpage regarding hex wordlist usage.
--- aircrack-ng-1.3/build/m4/aircrack_ng_windows.m4	2018-07-08 23:01:05.000000000 +0000
+++ aircrack-ng-1.3/build/m4/aircrack_ng_windows.m4	2018-07-11 01:27:26.000000000 +0000
@@ -41,6 +41,13 @@
 AX_REQUIRE_DEFINED([AC_CHECK_HEADER])[]dnl
 AX_REQUIRE_DEFINED([AX_COMPILER_VENDOR])dnl
 
+AC_ARG_ENABLE(win32-portable,
+    AS_HELP_STRING([--enable-win32-portable],
+        [Enable portable WIN32 edition]),
+    [
+        AC_DEFINE([WIN32_PORTABLE], [1], [Define if portable WIN32 is supported])
+    ], [])
+
 case "$host_os" in
     CYGWIN*|MSYS*|cygwin*|msys*)
         AC_CHECK_FILE(/usr/include/w32api/windows.h, [ CPPFLAGS="$CPPFLAGS -I/usr/include/w32api" ], [])
--- aircrack-ng-1.3/src/aircrack-ng.c	2018-07-08 23:01:05.000000000 +0000
+++ aircrack-ng-1.3/src/aircrack-ng.c	2018-07-11 01:27:26.000000000 +0000
@@ -5667,7 +5667,8 @@
 		simd_features = simd_get_supported_features();
 	}
 
-	ac_crypto_engine_loader_load(simd_features);
+	if (ac_crypto_engine_loader_load(simd_features) != 0)
+        exit(1);
 
 	simd_destroy();
 }
--- aircrack-ng-1.3/src/aircrack-util/Makefile.am	2018-07-08 23:01:05.000000000 +0000
+++ aircrack-ng-1.3/src/aircrack-util/Makefile.am	2018-07-11 01:27:26.000000000 +0000
@@ -67,6 +67,9 @@
                              "-DABS_TOP_SRCDIR=\"$(abs_top_srcdir)\"" \
                              "-DABS_TOP_BUILDDIR=\"$(abs_top_builddir)\"" \
                              "-DLIBDIR=\"$(libdir)\""
+if CYGWIN
+libaircrack_util_la_LIBADD = -lshlwapi
+endif
 
 if STATIC_BUILD
 libaircrack_util_la_CFLAGS += -DSTATIC_BUILD
--- aircrack-ng-1.3/src/aircrack-util/crypto_engine_loader.c	2018-07-08 23:01:05.000000000 +0000
+++ aircrack-ng-1.3/src/aircrack-util/crypto_engine_loader.c	2018-07-11 01:27:26.000000000 +0000
@@ -116,13 +116,53 @@
 	NULL;
 #endif
 
+#if defined(CYGWIN)
+/*
+	This is merely a hack until code refactoring can occur.
+
+	A new module is needed for handling file and path operations, because
+	this here is only a step towards correctly getting the executable
+	path for all operating systems.
+
+	It was required for Cygwin to determine the location of the
+	Crypto Engine DLLs which are in the same folder as the
+	executable.
+*/
+#include <stdarg.h>
+#include <stdio.h>
+#include <wtypes.h>
+#include <wchar.h>
+#include <sys/cygwin.h>
+
+#include <windows.h>
+#include <shlwapi.h>
+
+static char *get_executable_directory(void)
+{
+	HMODULE hModule = GetModuleHandle(NULL);
+	CHAR path[MAX_PATH];
+
+	GetModuleFileNameA(hModule, path, MAX_PATH);
+	PathRemoveFileSpecA(path);
+
+	cygwin_conv_path_t flags = CCP_WIN_A_TO_POSIX;
+	char *winpath = (char*) cygwin_create_path(flags, path);
+
+	return winpath;
+}
+#endif
+
 EXPORT int ac_crypto_engine_loader_get_available(void)
 {
 	int simd_flags = SIMD_SUPPORTS_NONE;
 	char library_path[8192];
 
+#if defined(WIN32_PORTABLE)
+	char *working_directory = get_executable_directory();
+#else
 	// are we inside of the build path?
 	char *working_directory = get_current_working_directory();
+#endif
 
 	if (strncmp(working_directory, ABS_TOP_BUILDDIR, strlen(ABS_TOP_BUILDDIR)) == 0
 	    || strncmp(working_directory, ABS_TOP_SRCDIR, strlen(ABS_TOP_SRCDIR)) == 0)
@@ -132,8 +172,13 @@
 	}
 	else
 	{
+#if defined(WIN32_PORTABLE)
+		// use the current directory
+		snprintf(library_path, sizeof(library_path) - 1, working_directory);
+#else
 		// use installation paths
 		snprintf(library_path, sizeof(library_path) - 1, "%s", LIBDIR);
+#endif
 	}
 	free(working_directory);
 
@@ -226,8 +271,13 @@
 	}
 	free(working_directory);
 
-	snprintf(module_filename, sizeof(module_filename) - 1, "%s/%s%s%s",
+	snprintf(module_filename, sizeof(module_filename) - 1,
+#if defined(WIN32_PORTABLE)
+		"%s%s%s",
+#else
+		"%s/%s%s%s",
 		library_path,
+#endif
 #if defined(WIN32) || defined(_WIN32) || defined(CYGWIN)
 #if defined(MSYS2)
 		"msys-",
@@ -305,7 +355,7 @@
 	module = dlopen (module_filename, RTLD_LAZY);
 	if (!module)
 	{
-		fprintf(stderr, "Could not open '%s'.\n", module_filename);
+		fprintf(stderr, "Could not open '%s': %s\n", module_filename, dlerror());
 		free(module_filename);
 		return 1;
 	}