Accepting request 407733 from security
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/407733 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hashcat?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c8d38ee586
@ -1,52 +0,0 @@
|
||||
From 1a79f0b2912388cff61d6571da69217dbd877fe4 Mon Sep 17 00:00:00 2001
|
||||
From: philsmd <philsmd@hashcat.net>
|
||||
Date: Sat, 5 Dec 2015 11:32:46 +0100
|
||||
Subject: [PATCH] fixes issue #10: compiler warning for possible memory problem
|
||||
(-m 11400 only)
|
||||
|
||||
---
|
||||
docs/changes.txt | 7 +++++++
|
||||
src/hashcat-cli.c | 11 +++++++++--
|
||||
2 files changed, 16 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/docs/changes.txt b/docs/changes.txt
|
||||
index 7f6675d..9c7ecea 100644
|
||||
--- a/docs/changes.txt
|
||||
+++ b/docs/changes.txt
|
||||
@@ -1,3 +1,10 @@
|
||||
+* changes v2.00 -> v2.01:
|
||||
+
|
||||
+type.: Feature
|
||||
+file.: Host
|
||||
+desc.: Fix a possible memory problem for hash type -m 11400 = SIP digest authentication (MD5)
|
||||
+issue: 10
|
||||
+
|
||||
* changes v0.50 -> v2.00:
|
||||
|
||||
type: Project
|
||||
diff --git a/src/hashcat-cli.c b/src/hashcat-cli.c
|
||||
index 8c9c951..0ede840 100644
|
||||
--- a/src/hashcat-cli.c
|
||||
+++ b/src/hashcat-cli.c
|
||||
@@ -13159,9 +13159,16 @@ void load_hashes (FILE *fp, db_t *db, engine_parameter_t *engine_parameter)
|
||||
|
||||
memset (&salt_search->additional_plain_struct[i].buf, 0, additional_plain_max_len);
|
||||
|
||||
- snprintf (additional_plain_ptr, additional_plain_max_len + 1, "%s:%s:", user_pos, realm_pos);
|
||||
+ int buf_len = snprintf (additional_plain_ptr, additional_plain_max_len, "%s:%s:", user_pos, realm_pos);
|
||||
|
||||
- salt_search->additional_plain_struct[i].len = user_len + 1 + realm_len + 1;
|
||||
+ int expected_buf_len = user_len + 1 + realm_len + 1;
|
||||
+
|
||||
+ if (buf_len != expected_buf_len) // this should never occur because buffer is large enough, but we better have a check anyway
|
||||
+ {
|
||||
+ log_warning ("username and realm (%d bytes) do not fit within the buffer (%d bytes)", expected_buf_len, buf_len);
|
||||
+ }
|
||||
+
|
||||
+ salt_search->additional_plain_struct[i].len = buf_len;
|
||||
}
|
||||
|
||||
salt_t *salt;
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6325e6d75a4df3485adec00f74e5887326809c15ed31bfe74a12b62943245444
|
||||
size 3463012
|
||||
17
flags.diff
Normal file
17
flags.diff
Normal file
@ -0,0 +1,17 @@
|
||||
---
|
||||
src/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: hashcat-3.00/src/Makefile
|
||||
===================================================================
|
||||
--- hashcat-3.00.orig/src/Makefile
|
||||
+++ hashcat-3.00/src/Makefile
|
||||
@@ -87,7 +87,7 @@ VERSION_TAG := $(shell test
|
||||
## Compiler flags
|
||||
##
|
||||
|
||||
-CFLAGS := -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/
|
||||
+CFLAGS := ${our_CFLAGS} -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/
|
||||
|
||||
ifndef DEBUG
|
||||
CFLAGS += -O2
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jun 30 19:49:34 UTC 2016 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release oclhashcat-3.00
|
||||
- Drop 0001-fixes-issue-10-compiler-warning-for-possible-memory-.patch
|
||||
(no longer applicable), add flags.diff.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Dec 6 12:21:38 UTC 2015 - jengelh@inai.de
|
||||
|
||||
|
||||
26
hashcat.spec
26
hashcat.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package hashcat
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: hashcat
|
||||
Version: 2.00
|
||||
Version: 3.00
|
||||
Release: 0
|
||||
Summary: CPU-based password recovery utility
|
||||
License: MIT
|
||||
@ -25,9 +25,10 @@ Group: Productivity/Security
|
||||
Url: https://hashcat.net/
|
||||
|
||||
#Git-Clone: git://github.com/hashcat/hashcat
|
||||
Source: https://github.com/hashcat/hashcat/archive/%version.tar.gz
|
||||
Patch1: 0001-fixes-issue-10-compiler-warning-for-possible-memory-.patch
|
||||
Source: https://github.com/hashcat/hashcat/archive/v%version.tar.gz
|
||||
Patch1: flags.diff
|
||||
BuildRequires: gmp-devel
|
||||
BuildRequires: opencl-headers
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
ExclusiveArch: %ix86 x86_64
|
||||
|
||||
@ -41,25 +42,16 @@ hashing algorithms.
|
||||
%patch -P 1 -p1
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} CFLAGS="%optflags -Iinclude" LIBGMP_POSIX32="%_prefix" \
|
||||
LIBGMP_POSIX64="%_prefix" \
|
||||
%ifarch x86_64
|
||||
posix64
|
||||
%else
|
||||
posix32
|
||||
%endif
|
||||
make %{?_smp_mflags} COMPTIME=0 our_CFLAGS="%optflags" PREFIX="%_prefix"
|
||||
|
||||
%install
|
||||
%ifarch x86_64
|
||||
install -Dpm 0755 hashcat-cli64.bin "%buildroot/%_bindir/hashcat"
|
||||
%endif
|
||||
%ifarch %ix86
|
||||
install -Dpm 0755 hashcat-cli32.bin "%buildroot/%_bindir/hashcat"
|
||||
%endif
|
||||
%make_install PREFIX="%_prefix" DOCUMENT_FOLDER="%_docdir/%name"
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README.md docs/license.txt
|
||||
%_bindir/hashcat
|
||||
%_datadir/%name/
|
||||
%_docdir/%name/
|
||||
|
||||
%changelog
|
||||
|
||||
3
v3.00.tar.gz
Normal file
3
v3.00.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:0283791b91db9dd7ee7431d8975c63419c73232945b76eedcefbe12becfa19c4
|
||||
size 4068649
|
||||
Loading…
Reference in New Issue
Block a user