summaryrefslogtreecommitdiff
path: root/security/hashcat/files/patch-src_hashcat-cli.c
diff options
context:
space:
mode:
authorMatthew Seaman <matthew@FreeBSD.org>2016-07-11 21:21:35 +0000
committerMatthew Seaman <matthew@FreeBSD.org>2016-07-11 21:21:35 +0000
commitcfcc60d58cbf54c7e32cf38a2028ee1e2c3ae378 (patch)
tree61d88ac62d5eae63f7c087b9183d67ca6036355e /security/hashcat/files/patch-src_hashcat-cli.c
parentSet NO_ARCH=yes. (diff)
Upgrade to 3.00
This is a major rewrite that combines the codebases of the former hashcat (running on the main CPU) and oclHashcat (running on the GPU). Because of the extent of the changes, the previous version will still remain available, renamed to 'hashcat-legacy' (following upstream) ChangeLog: https://github.com/hashcat/hashcat/releases/tag/v3.00 PR: 210873 Submitted by: lifanov@mail.lifanov.com (maintainer)
Notes
Notes: svn path=/head/; revision=418409
Diffstat (limited to 'security/hashcat/files/patch-src_hashcat-cli.c')
-rw-r--r--security/hashcat/files/patch-src_hashcat-cli.c95
1 files changed, 0 insertions, 95 deletions
diff --git a/security/hashcat/files/patch-src_hashcat-cli.c b/security/hashcat/files/patch-src_hashcat-cli.c
deleted file mode 100644
index b792639b61f0..000000000000
--- a/security/hashcat/files/patch-src_hashcat-cli.c
+++ /dev/null
@@ -1,95 +0,0 @@
---- src/hashcat-cli.c.orig 2015-12-04 15:35:08 UTC
-+++ src/hashcat-cli.c
-@@ -17,14 +17,14 @@
-
- // for interactive status prompt
- #ifdef POSIX
--#ifndef OSX
-+#if defined(OSX) || defined(__FreeBSD__)
-
--#include <termio.h>
-+#include <termios.h>
-+#include <sys/ioctl.h>
-
- #else
-
--#include <termios.h>
--#include <sys/ioctl.h>
-+#include <termio.h>
-
- #endif
- #endif
-@@ -2836,16 +2836,16 @@ void save_hash ()
-
- #ifdef POSIX
-
--#ifndef OSX
-+#if defined(OSX) || defined(__FreeBSD__)
-
--static struct termio savemodes;
-+static struct termios savemodes;
- static int havemodes = 0;
-
- int tty_break ()
- {
-- struct termio modmodes;
-+ struct termios modmodes;
-
-- if (ioctl (fileno (stdin), TCGETA, &savemodes) < 0) return -1;
-+ if (ioctl (fileno (stdin), TIOCGETA, &savemodes) < 0) return -1;
-
- havemodes = 1;
-
-@@ -2854,7 +2854,7 @@ int tty_break ()
- modmodes.c_cc[VMIN] = 1;
- modmodes.c_cc[VTIME] = 0;
-
-- return ioctl (fileno (stdin), TCSETAW, &modmodes);
-+ return ioctl (fileno (stdin), TIOCSETAW, &modmodes);
- }
-
- int tty_getchar ()
-@@ -2882,19 +2882,19 @@ int tty_fix ()
- {
- if (!havemodes) return 0;
-
-- return ioctl (fileno (stdin), TCSETAW, &savemodes);
-+ return ioctl (fileno (stdin), TIOCSETAW, &savemodes);
- }
-
- #else
-
--static struct termios savemodes;
-+static struct termio savemodes;
- static int havemodes = 0;
-
- int tty_break ()
- {
-- struct termios modmodes;
-+ struct termio modmodes;
-
-- if (ioctl (fileno (stdin), TIOCGETA, &savemodes) < 0) return -1;
-+ if (ioctl (fileno (stdin), TCGETA, &savemodes) < 0) return -1;
-
- havemodes = 1;
-
-@@ -2903,7 +2903,7 @@ int tty_break ()
- modmodes.c_cc[VMIN] = 1;
- modmodes.c_cc[VTIME] = 0;
-
-- return ioctl (fileno (stdin), TIOCSETAW, &modmodes);
-+ return ioctl (fileno (stdin), TCSETAW, &modmodes);
- }
-
- int tty_getchar ()
-@@ -2931,8 +2931,9 @@ int tty_fix ()
- {
- if (!havemodes) return 0;
-
-- return ioctl (fileno (stdin), TIOCSETAW, &savemodes);
-+ return ioctl (fileno (stdin), TCSETAW, &savemodes);
- }
-+
- #endif
- #endif
-