From 45d3a191304b4c16135161d8df7fbc9c8a98c8c0 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 1 Dec 2020 15:01:58 +0100 Subject: [PATCH 01/29] Added BR: make. --- hashcat.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/hashcat.spec b/hashcat.spec index 3206a78..d51fb5e 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -29,6 +29,7 @@ BuildRequires: bash-completion BuildRequires: opencl-headers BuildRequires: xxhash-devel BuildRequires: gcc +BuildRequires: make %if %{with zlib} BuildRequires: zlib-devel From 590c03d2aed8526cc4ea7602f71040b50e1ad5c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 13:22:16 +0000 Subject: [PATCH 02/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hashcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index d51fb5e..c228a56 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Advanced password recovery utility License: MIT and Public Domain @@ -109,6 +109,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Vitaly Zaitsev - 6.1.1-1 - Updated to version 6.1.1. From 1f67b62744d7c667c81c9a4b74a3186fdbd8aa1a Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 15 May 2021 15:09:24 +0200 Subject: [PATCH 03/29] Updated to version 6.2.1. --- .gitignore | 1 + hashcat-build-fixes.patch | 18 ++++++------ hashcat.spec | 59 ++++++++++----------------------------- make_tarball.sh | 27 ++++++++++++++++++ sources | 2 +- 5 files changed, 52 insertions(+), 55 deletions(-) create mode 100755 make_tarball.sh diff --git a/.gitignore b/.gitignore index ba0db11..77e1860 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /hashcat-5.1.0.tar.gz /hashcat-6.0.0.tar.gz /hashcat-6.1.1.tar.gz +/hashcat-6.2.1-clean.tar.xz diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index b9c7577..0274899 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,4 +1,4 @@ -From 2b730180e108289cea3c6ffb1cbb7fdc72d96a38 Mon Sep 17 00:00:00 2001 +From f028513101dbcfb4b315abfc18a478dda35ac6d8 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 17 Jun 2020 10:57:15 +0200 Subject: [PATCH] Fedora build patches. @@ -8,10 +8,10 @@ Subject: [PATCH] Fedora build patches. 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile -index c2441456..d9143d69 100644 +index b79a59ac5..be4b35096 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -40,7 +40,7 @@ endif +@@ -43,7 +43,7 @@ endif ## Makefile flags ## @@ -20,7 +20,7 @@ index c2441456..d9143d69 100644 ifneq ($(findstring clean,$(MAKECMDGOALS)),) MAKEFLAGS += -j 1 -@@ -186,10 +186,7 @@ CFLAGS_ZLIB += -DIOAPI_NO_64 +@@ -222,10 +222,7 @@ endif endif ifeq ($(DEBUG),0) @@ -32,24 +32,24 @@ index c2441456..d9143d69 100644 else ifeq ($(DEBUG),1) ifneq ($(UNAME),Darwin) -@@ -397,7 +394,7 @@ Only Linux, FreeBSD and Darwin can use the 'install' target - endif +@@ -461,7 +458,7 @@ endif + .PHONY: install ifeq ($(SHARED),1) -install: install_docs install_shared install_library install_library_dev install_kernels install_modules install_hashcat +install: install_shared install_library install_library_dev install_kernels install_modules install_hashcat else install: install_docs install_shared install_kernels install_modules install_hashcat endif -@@ -457,7 +454,7 @@ install_kernels: install_shared +@@ -527,7 +524,7 @@ install_kernels: install_shared install_modules: install_shared modules $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules $(FIND) modules/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; - $(FIND) modules/ -mindepth 1 -type f -execdir $(INSTALL) -m 644 {} $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; + $(FIND) modules/ -mindepth 1 -type f -execdir $(INSTALL) -m 755 {} $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; + .PHONY: install_library install_library: $(HASHCAT_LIBRARY) - $(INSTALL) -m 755 -d $(DESTDIR)$(LIBRARY_FOLDER) -- -2.26.2 +2.31.1 diff --git a/hashcat.spec b/hashcat.spec index c228a56..44ea276 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -7,7 +7,7 @@ %bcond_with zlib %endif -%global makeflags PREFIX=%{_prefix} LIBRARY_FOLDER=%{_libdir} SHARED_ROOT_FOLDER=%{_libdir} DOCUMENT_FOLDER=%{_docdir}/hashcat-doc SHARED=1 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 +%global makeflags PREFIX=%{_prefix} LIBRARY_FOLDER=%{_libdir} SHARED_ROOT_FOLDER=%{_libdir} DOCUMENT_FOLDER=%{_docdir}/hashcat-doc SHARED=1 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 ENABLE_UNRAR=0 %if %{with zlib} %global makeflags %(echo %{makeflags} USE_SYSTEM_ZLIB=1) @@ -16,16 +16,20 @@ %endif Name: hashcat -Version: 6.1.1 -Release: 2%{?dist} -Summary: Advanced password recovery utility +Version: 6.2.1 +Release: 1%{?dist} License: MIT and Public Domain URL: https://github.com/%{name}/%{name} -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Summary: Advanced password recovery utility + +# The official upstream tarball contains some non-free components. +# We cannot use it on Fedora for legal reasons. +# Use ./make_tarball.sh to generate a new stripped tarball. +Source0: %{name}-%{version}-clean.tar.xz +Source1: make_tarball.sh Patch0: %{name}-build-fixes.patch -BuildRequires: bash-completion BuildRequires: opencl-headers BuildRequires: xxhash-devel BuildRequires: gcc @@ -39,7 +43,6 @@ Provides: bundled(zlib) = 1.2.11 Provides: bundled(minizip) = 1.2.11 %endif -Requires: bash-completion %if 0%{?fedora} Recommends: mesa-libOpenCL%{?_isa} Recommends: pocl%{?_isa} @@ -95,7 +98,7 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %files %license docs/license.txt %doc README.md -%{_datadir}/bash-completion/completions/%{name} +%{_datadir}/bash-completion/ %{_libdir}/lib%{name}.so.%{version} %{_libdir}/%{name}/ %{_bindir}/%{name} @@ -109,42 +112,8 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Sat May 15 2021 Vitaly Zaitsev - 6.2.1-1 +- Updated to version 6.2.1. + * Tue Jan 26 2021 Fedora Release Engineering - 6.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jul 31 2020 Vitaly Zaitsev - 6.1.1-1 -- Updated to version 6.1.1. - -* Tue Jul 28 2020 Fedora Release Engineering - 6.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jun 19 2020 Vitaly Zaitsev - 6.0.0-3 -- Backported upstream patch with NVIDIA OpenCL fixes. - -* Thu Jun 18 2020 Vitaly Zaitsev - 6.0.0-2 -- Fixed packaging issues, related to modules. - -* Wed Jun 17 2020 Vitaly Zaitsev - 6.0.0-1 -- Updated to version 6.0.0. - -* Tue Feb 25 2020 Vitaly Zaitsev - 5.1.0-7 -- Allow to install without mesa-libOpenCL. -- Added pocl as a weak dependency on Fedora. - -* Wed Jan 29 2020 Fedora Release Engineering - 5.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 5.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 24 2019 Vitaly Zaitsev - 5.1.0-4 -- Switched to regular build instead of debug. - -* Mon Feb 18 2019 Vitaly Zaitsev - 5.1.0-3 -- Fixed problem with dependencies on EPEL7. - -* Thu Feb 07 2019 Vitaly Zaitsev - 5.1.0-2 -- Moved documentation to a separate package. - -* Wed Feb 06 2019 Vitaly Zaitsev - 5.1.0-1 -- Initial SPEC release. diff --git a/make_tarball.sh b/make_tarball.sh new file mode 100755 index 0000000..40d3e67 --- /dev/null +++ b/make_tarball.sh @@ -0,0 +1,27 @@ +#!/usr/bin/bash +set -e + +NAME="hashcat" +VERSION="6.2.1" + +TARBALL_DIR="$NAME-$VERSION" +TARBALL_ORIG="$NAME-$VERSION.tar.gz" +TARBALL_NEW="$NAME-$VERSION-clean.tar.xz" + +echo "Downloading upstream tarball..." +wget "https://github.com/hashcat/hashcat/archive/v$VERSION/$TARBALL_ORIG" -O "$TARBALL_ORIG" 2>/dev/null + +echo "Unpacking upstream tarball..." +tar -xf "$TARBALL_ORIG" + +echo "Removing non-free components..." +rm -rf "$TARBALL_DIR/deps/unrar" + +echo "Building a new tarball..." +tar -cJf "$TARBALL_NEW" "$TARBALL_DIR" + +echo "Performing cleanup..." +rm -f "$TARBALL_ORIG" +rm -rf "$TARBALL_DIR" + +echo "Done." diff --git a/sources b/sources index df1bc84..895672d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashcat-6.1.1.tar.gz) = 788539b488ba55684d6d93ce18f3b05fa822a8cbfcdbcde9c2b54001d8927580dca253e0e9ff9a19f4278045046d732e104054fc743c39f47952ca24d2e93724 +SHA512 (hashcat-6.2.1-clean.tar.xz) = e79d719223c02389b4a684d97d37635a083c678203e83fee6c57e1c55119be027795258760dac182ef0f4f8a8063f6366b3ecc0a76af029d7f3f669f9c033c45 From 6d7826d924a58cd44e1311a81f5c6499c9dcd67e Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 13 Jun 2021 17:20:05 +0200 Subject: [PATCH 04/29] Updated to version 6.2.2. --- .gitignore | 1 + hashcat-build-fixes.patch | 10 +++++----- hashcat.spec | 5 ++++- make_tarball.sh | 2 +- sources | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 77e1860..7745bcb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /hashcat-6.0.0.tar.gz /hashcat-6.1.1.tar.gz /hashcat-6.2.1-clean.tar.xz +/hashcat-6.2.2-clean.tar.xz diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index 0274899..fbca243 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,4 +1,4 @@ -From f028513101dbcfb4b315abfc18a478dda35ac6d8 Mon Sep 17 00:00:00 2001 +From f41879a099fceaef0a1a648dc78a2437006b2866 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 17 Jun 2020 10:57:15 +0200 Subject: [PATCH] Fedora build patches. @@ -8,7 +8,7 @@ Subject: [PATCH] Fedora build patches. 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile -index b79a59ac5..be4b35096 100644 +index 2c691bc47..d55b7b5ba 100644 --- a/src/Makefile +++ b/src/Makefile @@ -43,7 +43,7 @@ endif @@ -20,7 +20,7 @@ index b79a59ac5..be4b35096 100644 ifneq ($(findstring clean,$(MAKECMDGOALS)),) MAKEFLAGS += -j 1 -@@ -222,10 +222,7 @@ endif +@@ -223,10 +223,7 @@ endif endif ifeq ($(DEBUG),0) @@ -32,7 +32,7 @@ index b79a59ac5..be4b35096 100644 else ifeq ($(DEBUG),1) ifneq ($(UNAME),Darwin) -@@ -461,7 +458,7 @@ endif +@@ -467,7 +464,7 @@ endif .PHONY: install ifeq ($(SHARED),1) @@ -41,7 +41,7 @@ index b79a59ac5..be4b35096 100644 else install: install_docs install_shared install_kernels install_modules install_hashcat endif -@@ -527,7 +524,7 @@ install_kernels: install_shared +@@ -533,7 +530,7 @@ install_kernels: install_shared install_modules: install_shared modules $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules $(FIND) modules/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; diff --git a/hashcat.spec b/hashcat.spec index 44ea276..f6a6764 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -16,7 +16,7 @@ %endif Name: hashcat -Version: 6.2.1 +Version: 6.2.2 Release: 1%{?dist} License: MIT and Public Domain @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Sun Jun 13 2021 Vitaly Zaitsev - 6.2.2-1 +- Updated to version 6.2.2. + * Sat May 15 2021 Vitaly Zaitsev - 6.2.1-1 - Updated to version 6.2.1. diff --git a/make_tarball.sh b/make_tarball.sh index 40d3e67..b6a8065 100755 --- a/make_tarball.sh +++ b/make_tarball.sh @@ -2,7 +2,7 @@ set -e NAME="hashcat" -VERSION="6.2.1" +VERSION="6.2.2" TARBALL_DIR="$NAME-$VERSION" TARBALL_ORIG="$NAME-$VERSION.tar.gz" diff --git a/sources b/sources index 895672d..72d9f04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashcat-6.2.1-clean.tar.xz) = e79d719223c02389b4a684d97d37635a083c678203e83fee6c57e1c55119be027795258760dac182ef0f4f8a8063f6366b3ecc0a76af029d7f3f669f9c033c45 +SHA512 (hashcat-6.2.2-clean.tar.xz) = 281d969b59b602a5adfbf6f6733c455a28f92733fbd5f50607a0ca65cf0621adc798f73a85707d25874f1934e6e8e3e0304cc01c77dfb491c6a0689c8889ef60 From 35a2ccc2fb3ce018dd40adae702e16bfbf7c3077 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 13 Jun 2021 17:27:27 +0200 Subject: [PATCH 05/29] Backported upstream fix. --- hashcat-e-rule-fixes.patch | 45 ++++++++++++++++++++++++++++++++++++++ hashcat.spec | 3 +++ 2 files changed, 48 insertions(+) create mode 100644 hashcat-e-rule-fixes.patch diff --git a/hashcat-e-rule-fixes.patch b/hashcat-e-rule-fixes.patch new file mode 100644 index 0000000..bd7d997 --- /dev/null +++ b/hashcat-e-rule-fixes.patch @@ -0,0 +1,45 @@ +diff --git a/OpenCL/inc_rp.cl b/OpenCL/inc_rp.cl +index 9a50e18020..8cecc661da 100644 +--- a/OpenCL/inc_rp.cl ++++ b/OpenCL/inc_rp.cl +@@ -688,7 +688,9 @@ DECLSPEC int mangle_dupeblock_last (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const + + DECLSPEC int mangle_title_sep (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) + { +- if ((len + 4) >= RP_PASSWORD_SIZE) return (len); // cheap way to not need to check for overflow of i + 1 ++ if (len >= RP_PASSWORD_SIZE) return (len); ++ ++ u32 rem = 0xff; + + for (int i = 0, idx = 0; i < len; i += 4, idx += 1) + { +@@ -696,21 +698,17 @@ DECLSPEC int mangle_title_sep (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p + + buf[idx] = t | generate_cmask (t); + +- u32 out0 = 0; +- u32 out1 = 0; +- +- if (((t >> 0) & 0xff) == p0) out0 |= 0x0000ff00; +- if (((t >> 8) & 0xff) == p0) out0 |= 0x00ff0000; +- if (((t >> 16) & 0xff) == p0) out0 |= 0xff000000; +- if (((t >> 24) & 0xff) == p0) out1 |= 0x000000ff; ++ u32 out = rem; + +- buf[idx + 0] &= ~(generate_cmask (buf[idx + 0]) & out0); +- buf[idx + 1] &= ~(generate_cmask (buf[idx + 1]) & out1); +- } ++ rem = 0; + +- const u32 t = buf[0]; ++ if (((t >> 0) & 0xff) == p0) out |= 0x0000ff00; ++ if (((t >> 8) & 0xff) == p0) out |= 0x00ff0000; ++ if (((t >> 16) & 0xff) == p0) out |= 0xff000000; ++ if (((t >> 24) & 0xff) == p0) rem |= 0x000000ff; + +- buf[0] = t & ~(0x00000020 & generate_cmask (t)); ++ buf[idx] &= ~(generate_cmask (buf[idx]) & out); ++ } + + return (len); + } diff --git a/hashcat.spec b/hashcat.spec index f6a6764..da61b47 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -30,6 +30,9 @@ Source0: %{name}-%{version}-clean.tar.xz Source1: make_tarball.sh Patch0: %{name}-build-fixes.patch +# https://github.com/hashcat/hashcat/commit/8ebf4b98584213891f6e48570c91c31d22b80a81 +Patch100: %{name}-e-rule-fixes.patch + BuildRequires: opencl-headers BuildRequires: xxhash-devel BuildRequires: gcc From d2b836df1dd52020bc08b5bc7ccd952f46659e96 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sat, 17 Jul 2021 15:04:16 +0200 Subject: [PATCH 06/29] Updated to version 6.2.3. --- .gitignore | 1 + hashcat-build-fixes.patch | 8 +++---- hashcat-e-rule-fixes.patch | 45 -------------------------------------- hashcat.spec | 11 ++++------ make_tarball.sh | 2 +- sources | 2 +- 6 files changed, 11 insertions(+), 58 deletions(-) delete mode 100644 hashcat-e-rule-fixes.patch diff --git a/.gitignore b/.gitignore index 7745bcb..301d22e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /hashcat-6.1.1.tar.gz /hashcat-6.2.1-clean.tar.xz /hashcat-6.2.2-clean.tar.xz +/hashcat-6.2.3-clean.tar.xz diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index fbca243..4a1866e 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,4 +1,4 @@ -From f41879a099fceaef0a1a648dc78a2437006b2866 Mon Sep 17 00:00:00 2001 +From 29e1849f5d9df10d0b28654f8ab4c9ccf3c8a37e Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 17 Jun 2020 10:57:15 +0200 Subject: [PATCH] Fedora build patches. @@ -8,7 +8,7 @@ Subject: [PATCH] Fedora build patches. 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 2c691bc47..d55b7b5ba 100644 +index 943bf2405..395241025 100644 --- a/src/Makefile +++ b/src/Makefile @@ -43,7 +43,7 @@ endif @@ -32,7 +32,7 @@ index 2c691bc47..d55b7b5ba 100644 else ifeq ($(DEBUG),1) ifneq ($(UNAME),Darwin) -@@ -467,7 +464,7 @@ endif +@@ -463,7 +460,7 @@ endif .PHONY: install ifeq ($(SHARED),1) @@ -41,7 +41,7 @@ index 2c691bc47..d55b7b5ba 100644 else install: install_docs install_shared install_kernels install_modules install_hashcat endif -@@ -533,7 +530,7 @@ install_kernels: install_shared +@@ -529,7 +526,7 @@ install_kernels: install_shared install_modules: install_shared modules $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules $(FIND) modules/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; diff --git a/hashcat-e-rule-fixes.patch b/hashcat-e-rule-fixes.patch deleted file mode 100644 index bd7d997..0000000 --- a/hashcat-e-rule-fixes.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/OpenCL/inc_rp.cl b/OpenCL/inc_rp.cl -index 9a50e18020..8cecc661da 100644 ---- a/OpenCL/inc_rp.cl -+++ b/OpenCL/inc_rp.cl -@@ -688,7 +688,9 @@ DECLSPEC int mangle_dupeblock_last (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const - - DECLSPEC int mangle_title_sep (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p1, u32 *buf, const int len) - { -- if ((len + 4) >= RP_PASSWORD_SIZE) return (len); // cheap way to not need to check for overflow of i + 1 -+ if (len >= RP_PASSWORD_SIZE) return (len); -+ -+ u32 rem = 0xff; - - for (int i = 0, idx = 0; i < len; i += 4, idx += 1) - { -@@ -696,21 +698,17 @@ DECLSPEC int mangle_title_sep (MAYBE_UNUSED const u8 p0, MAYBE_UNUSED const u8 p - - buf[idx] = t | generate_cmask (t); - -- u32 out0 = 0; -- u32 out1 = 0; -- -- if (((t >> 0) & 0xff) == p0) out0 |= 0x0000ff00; -- if (((t >> 8) & 0xff) == p0) out0 |= 0x00ff0000; -- if (((t >> 16) & 0xff) == p0) out0 |= 0xff000000; -- if (((t >> 24) & 0xff) == p0) out1 |= 0x000000ff; -+ u32 out = rem; - -- buf[idx + 0] &= ~(generate_cmask (buf[idx + 0]) & out0); -- buf[idx + 1] &= ~(generate_cmask (buf[idx + 1]) & out1); -- } -+ rem = 0; - -- const u32 t = buf[0]; -+ if (((t >> 0) & 0xff) == p0) out |= 0x0000ff00; -+ if (((t >> 8) & 0xff) == p0) out |= 0x00ff0000; -+ if (((t >> 16) & 0xff) == p0) out |= 0xff000000; -+ if (((t >> 24) & 0xff) == p0) rem |= 0x000000ff; - -- buf[0] = t & ~(0x00000020 & generate_cmask (t)); -+ buf[idx] &= ~(generate_cmask (buf[idx]) & out); -+ } - - return (len); - } diff --git a/hashcat.spec b/hashcat.spec index da61b47..1341975 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -16,7 +16,7 @@ %endif Name: hashcat -Version: 6.2.2 +Version: 6.2.3 Release: 1%{?dist} License: MIT and Public Domain @@ -30,9 +30,6 @@ Source0: %{name}-%{version}-clean.tar.xz Source1: make_tarball.sh Patch0: %{name}-build-fixes.patch -# https://github.com/hashcat/hashcat/commit/8ebf4b98584213891f6e48570c91c31d22b80a81 -Patch100: %{name}-e-rule-fixes.patch - BuildRequires: opencl-headers BuildRequires: xxhash-devel BuildRequires: gcc @@ -115,11 +112,11 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Sat Jul 17 2021 Vitaly Zaitsev - 6.2.3-1 +- Updated to version 6.2.3. + * Sun Jun 13 2021 Vitaly Zaitsev - 6.2.2-1 - Updated to version 6.2.2. * Sat May 15 2021 Vitaly Zaitsev - 6.2.1-1 - Updated to version 6.2.1. - -* Tue Jan 26 2021 Fedora Release Engineering - 6.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/make_tarball.sh b/make_tarball.sh index b6a8065..0f041ff 100755 --- a/make_tarball.sh +++ b/make_tarball.sh @@ -2,7 +2,7 @@ set -e NAME="hashcat" -VERSION="6.2.2" +VERSION="6.2.3" TARBALL_DIR="$NAME-$VERSION" TARBALL_ORIG="$NAME-$VERSION.tar.gz" diff --git a/sources b/sources index 72d9f04..266ba6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashcat-6.2.2-clean.tar.xz) = 281d969b59b602a5adfbf6f6733c455a28f92733fbd5f50607a0ca65cf0621adc798f73a85707d25874f1934e6e8e3e0304cc01c77dfb491c6a0689c8889ef60 +SHA512 (hashcat-6.2.3-clean.tar.xz) = e3ad8dd04401de07e9dd4c8ee71b35675e5372039d361ed177fc6a0d6590ad5f26f88c7c0f3c2b794c8b29d676cbf2347fe61a810fd1c906e32feb88853afff2 From 92b8c2cf7de369ce2e094f43d62174bf40dfca7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 07:30:29 +0000 Subject: [PATCH 07/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hashcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index 1341975..0c0458e 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT and Public Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 6.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat Jul 17 2021 Vitaly Zaitsev - 6.2.3-1 - Updated to version 6.2.3. From 3f71920ffc4499fdc9ea91086d73dd311d9a6fa7 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Mon, 30 Aug 2021 13:55:52 +0200 Subject: [PATCH 08/29] Updated to version 6.2.4. --- .gitignore | 1 + hashcat-build-fixes.patch | 10 +++++----- hashcat.spec | 7 +++++-- make_tarball.sh | 2 +- sources | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 301d22e..cacca54 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /hashcat-6.2.1-clean.tar.xz /hashcat-6.2.2-clean.tar.xz /hashcat-6.2.3-clean.tar.xz +/hashcat-6.2.4-clean.tar.xz diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index 4a1866e..2e0b9f3 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,4 +1,4 @@ -From 29e1849f5d9df10d0b28654f8ab4c9ccf3c8a37e Mon Sep 17 00:00:00 2001 +From cd48f741de5470c113092678cc45cbde106a888f Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 17 Jun 2020 10:57:15 +0200 Subject: [PATCH] Fedora build patches. @@ -8,7 +8,7 @@ Subject: [PATCH] Fedora build patches. 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 943bf2405..395241025 100644 +index ba0cf9153..93e226ff1 100644 --- a/src/Makefile +++ b/src/Makefile @@ -43,7 +43,7 @@ endif @@ -20,7 +20,7 @@ index 943bf2405..395241025 100644 ifneq ($(findstring clean,$(MAKECMDGOALS)),) MAKEFLAGS += -j 1 -@@ -223,10 +223,7 @@ endif +@@ -222,10 +222,7 @@ endif endif ifeq ($(DEBUG),0) @@ -32,7 +32,7 @@ index 943bf2405..395241025 100644 else ifeq ($(DEBUG),1) ifneq ($(UNAME),Darwin) -@@ -463,7 +460,7 @@ endif +@@ -462,7 +459,7 @@ endif .PHONY: install ifeq ($(SHARED),1) @@ -41,7 +41,7 @@ index 943bf2405..395241025 100644 else install: install_docs install_shared install_kernels install_modules install_hashcat endif -@@ -529,7 +526,7 @@ install_kernels: install_shared +@@ -528,7 +525,7 @@ install_kernels: install_shared install_modules: install_shared modules $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules $(FIND) modules/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; diff --git a/hashcat.spec b/hashcat.spec index 0c0458e..7e1b024 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -16,8 +16,8 @@ %endif Name: hashcat -Version: 6.2.3 -Release: 2%{?dist} +Version: 6.2.4 +Release: 1%{?dist} License: MIT and Public Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Mon Aug 30 2021 Vitaly Zaitsev - 6.2.4-1 +- Updated to version 6.2.4. + * Thu Jul 22 2021 Fedora Release Engineering - 6.2.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/make_tarball.sh b/make_tarball.sh index 0f041ff..b958f25 100755 --- a/make_tarball.sh +++ b/make_tarball.sh @@ -2,7 +2,7 @@ set -e NAME="hashcat" -VERSION="6.2.3" +VERSION="6.2.4" TARBALL_DIR="$NAME-$VERSION" TARBALL_ORIG="$NAME-$VERSION.tar.gz" diff --git a/sources b/sources index 266ba6c..5623dde 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashcat-6.2.3-clean.tar.xz) = e3ad8dd04401de07e9dd4c8ee71b35675e5372039d361ed177fc6a0d6590ad5f26f88c7c0f3c2b794c8b29d676cbf2347fe61a810fd1c906e32feb88853afff2 +SHA512 (hashcat-6.2.4-clean.tar.xz) = f299eb4fbf5437c94a6269e905ba778929b47a9be48e28291dda7b5acd2fbaafa4da38ee5682aa849db13fc8a23bb6617dc375ba8b9368ce8d6c80732199c40e From 81fab3728ce95be60b71a23b4729585a202cbd22 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Sun, 21 Nov 2021 19:03:09 +0100 Subject: [PATCH 09/29] Updated to version 6.2.5. --- .gitignore | 1 + hashcat-build-fixes.patch | 12 ++++++------ hashcat.spec | 5 ++++- make_tarball.sh | 2 +- sources | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index cacca54..0381f72 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /hashcat-6.2.2-clean.tar.xz /hashcat-6.2.3-clean.tar.xz /hashcat-6.2.4-clean.tar.xz +/hashcat-6.2.5-clean.tar.xz diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index 2e0b9f3..dc52284 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,4 +1,4 @@ -From cd48f741de5470c113092678cc45cbde106a888f Mon Sep 17 00:00:00 2001 +From ca1cfb0ee3d82c6dba22a92ec7b45b35d8fdf473 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 17 Jun 2020 10:57:15 +0200 Subject: [PATCH] Fedora build patches. @@ -8,7 +8,7 @@ Subject: [PATCH] Fedora build patches. 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile -index ba0cf9153..93e226ff1 100644 +index e538b6c28..bb29cc5d3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -43,7 +43,7 @@ endif @@ -20,7 +20,7 @@ index ba0cf9153..93e226ff1 100644 ifneq ($(findstring clean,$(MAKECMDGOALS)),) MAKEFLAGS += -j 1 -@@ -222,10 +222,7 @@ endif +@@ -228,10 +228,7 @@ endif endif ifeq ($(DEBUG),0) @@ -32,7 +32,7 @@ index ba0cf9153..93e226ff1 100644 else ifeq ($(DEBUG),1) ifneq ($(UNAME),Darwin) -@@ -462,7 +459,7 @@ endif +@@ -468,7 +465,7 @@ endif .PHONY: install ifeq ($(SHARED),1) @@ -41,7 +41,7 @@ index ba0cf9153..93e226ff1 100644 else install: install_docs install_shared install_kernels install_modules install_hashcat endif -@@ -528,7 +525,7 @@ install_kernels: install_shared +@@ -534,7 +531,7 @@ install_kernels: install_shared install_modules: install_shared modules $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules $(FIND) modules/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; @@ -51,5 +51,5 @@ index ba0cf9153..93e226ff1 100644 .PHONY: install_library install_library: $(HASHCAT_LIBRARY) -- -2.31.1 +2.33.1 diff --git a/hashcat.spec b/hashcat.spec index 7e1b024..aec3bfe 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -16,7 +16,7 @@ %endif Name: hashcat -Version: 6.2.4 +Version: 6.2.5 Release: 1%{?dist} License: MIT and Public Domain @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Sun Nov 21 2021 Vitaly Zaitsev - 6.2.5-1 +- Updated to version 6.2.5. + * Mon Aug 30 2021 Vitaly Zaitsev - 6.2.4-1 - Updated to version 6.2.4. diff --git a/make_tarball.sh b/make_tarball.sh index b958f25..b65f01d 100755 --- a/make_tarball.sh +++ b/make_tarball.sh @@ -2,7 +2,7 @@ set -e NAME="hashcat" -VERSION="6.2.4" +VERSION="6.2.5" TARBALL_DIR="$NAME-$VERSION" TARBALL_ORIG="$NAME-$VERSION.tar.gz" diff --git a/sources b/sources index 5623dde..4e56472 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashcat-6.2.4-clean.tar.xz) = f299eb4fbf5437c94a6269e905ba778929b47a9be48e28291dda7b5acd2fbaafa4da38ee5682aa849db13fc8a23bb6617dc375ba8b9368ce8d6c80732199c40e +SHA512 (hashcat-6.2.5-clean.tar.xz) = a4e5b8eebb1464a3c2d43fd7357d3ac0ed87bba80987575f942937c56a04e2ca498c2c42a5dd9321cb9ec5b3cbf0eb823aee7ab4200e46343adbb6d335f9d3d9 From f3cfde28118ce09fe17a954974e5002ede510695 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 12:13:14 +0000 Subject: [PATCH 10/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hashcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index aec3bfe..9f27109 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT and Public Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 6.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Nov 21 2021 Vitaly Zaitsev - 6.2.5-1 - Updated to version 6.2.5. From dcbd2b83b370c244ceee314de9005b384594e38d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 13:30:14 +0000 Subject: [PATCH 11/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hashcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index 9f27109..84cd44e 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.5 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT and Public Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 6.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 6.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From b28fd29b7568290c1993bf86650d44475b2be9c1 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 2 Sep 2022 17:32:10 +0200 Subject: [PATCH 12/29] Removed hardcoded version from make_tarball.sh. --- make_tarball.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/make_tarball.sh b/make_tarball.sh index b65f01d..c2bafac 100755 --- a/make_tarball.sh +++ b/make_tarball.sh @@ -2,7 +2,13 @@ set -e NAME="hashcat" -VERSION="6.2.5" +VERSION="$1" + +if [ -z "$VERSION" ] +then + echo "Usage: ./make_tarball.sh {version}" + exit 1 +fi TARBALL_DIR="$NAME-$VERSION" TARBALL_ORIG="$NAME-$VERSION.tar.gz" From 36a3f6c47ba3cf55df953e7ee1e955cdb61acac2 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Fri, 2 Sep 2022 17:46:28 +0200 Subject: [PATCH 13/29] Updated to version 6.2.6. --- .gitignore | 1 + hashcat-build-fixes.patch | 18 +++++++++--------- hashcat.spec | 7 +++++-- sources | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 0381f72..6450f36 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /hashcat-6.2.3-clean.tar.xz /hashcat-6.2.4-clean.tar.xz /hashcat-6.2.5-clean.tar.xz +/hashcat-6.2.6-clean.tar.xz diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index dc52284..ba88c2a 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,4 +1,4 @@ -From ca1cfb0ee3d82c6dba22a92ec7b45b35d8fdf473 Mon Sep 17 00:00:00 2001 +From 49d6ac344d249941a0592113259a2af82914e319 Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Wed, 17 Jun 2020 10:57:15 +0200 Subject: [PATCH] Fedora build patches. @@ -8,7 +8,7 @@ Subject: [PATCH] Fedora build patches. 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile -index e538b6c28..bb29cc5d3 100644 +index 64f54dbf6..c0d587b35 100644 --- a/src/Makefile +++ b/src/Makefile @@ -43,7 +43,7 @@ endif @@ -20,7 +20,7 @@ index e538b6c28..bb29cc5d3 100644 ifneq ($(findstring clean,$(MAKECMDGOALS)),) MAKEFLAGS += -j 1 -@@ -228,10 +228,7 @@ endif +@@ -233,10 +233,7 @@ endif endif ifeq ($(DEBUG),0) @@ -32,16 +32,16 @@ index e538b6c28..bb29cc5d3 100644 else ifeq ($(DEBUG),1) ifneq ($(UNAME),Darwin) -@@ -468,7 +465,7 @@ endif +@@ -505,7 +502,7 @@ endif .PHONY: install ifeq ($(SHARED),1) --install: install_docs install_shared install_library install_library_dev install_kernels install_modules install_hashcat -+install: install_shared install_library install_library_dev install_kernels install_modules install_hashcat +-install: install_docs install_shared install_library install_library_dev install_tunings install_kernels install_modules install_hashcat ++install: install_shared install_library install_library_dev install_tunings install_kernels install_modules install_hashcat else - install: install_docs install_shared install_kernels install_modules install_hashcat + install: install_docs install_shared install_tunings install_kernels install_modules install_hashcat endif -@@ -534,7 +531,7 @@ install_kernels: install_shared +@@ -578,7 +575,7 @@ install_kernels: install_shared install_modules: install_shared modules $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules $(FIND) modules/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; @@ -51,5 +51,5 @@ index e538b6c28..bb29cc5d3 100644 .PHONY: install_library install_library: $(HASHCAT_LIBRARY) -- -2.33.1 +2.37.2 diff --git a/hashcat.spec b/hashcat.spec index 84cd44e..d3f27a7 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -16,8 +16,8 @@ %endif Name: hashcat -Version: 6.2.5 -Release: 3%{?dist} +Version: 6.2.6 +Release: 1%{?dist} License: MIT and Public Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Fri Sep 02 2022 Vitaly Zaitsev - 6.2.6-1 +- Updated to version 6.2.6. + * Thu Jul 21 2022 Fedora Release Engineering - 6.2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 4e56472..403430d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashcat-6.2.5-clean.tar.xz) = a4e5b8eebb1464a3c2d43fd7357d3ac0ed87bba80987575f942937c56a04e2ca498c2c42a5dd9321cb9ec5b3cbf0eb823aee7ab4200e46343adbb6d335f9d3d9 +SHA512 (hashcat-6.2.6-clean.tar.xz) = 3c7bdf4209d28bf5bc62d43ea4bb44a158a0226769ec9e1e9b92571fdfd0f1f89ee581edddb6582491e5cc8f44becde13b9caf8a169ed766c79bc114dc204a9f From f8a0842cf29c435b123401ce54f01b1a36a6ffba Mon Sep 17 00:00:00 2001 From: Vitaly Zaitsev Date: Tue, 13 Dec 2022 16:02:17 +0100 Subject: [PATCH 14/29] Converted license tag to SPDX format. --- .gitignore | 10 +--------- README.md | 3 --- hashcat.spec | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 README.md diff --git a/.gitignore b/.gitignore index 6450f36..8775420 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1 @@ -/hashcat-5.1.0.tar.gz -/hashcat-6.0.0.tar.gz -/hashcat-6.1.1.tar.gz -/hashcat-6.2.1-clean.tar.xz -/hashcat-6.2.2-clean.tar.xz -/hashcat-6.2.3-clean.tar.xz -/hashcat-6.2.4-clean.tar.xz -/hashcat-6.2.5-clean.tar.xz -/hashcat-6.2.6-clean.tar.xz +/hashcat-*.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 54d774c..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# hashcat - -The hashcat package \ No newline at end of file diff --git a/hashcat.spec b/hashcat.spec index d3f27a7..b5c04ca 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -19,7 +19,7 @@ Name: hashcat Version: 6.2.6 Release: 1%{?dist} -License: MIT and Public Domain +License: MIT AND LicenseRef-Fedora-Public-Domain URL: https://github.com/%{name}/%{name} Summary: Advanced password recovery utility From c4f4eb02ef0c4b4fb94f13c60b964aeb413da462 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 12:00:30 +0000 Subject: [PATCH 15/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hashcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index b5c04ca..2aae459 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.6 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT AND LicenseRef-Fedora-Public-Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 6.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Sep 02 2022 Vitaly Zaitsev - 6.2.6-1 - Updated to version 6.2.6. From a41ee7abd3b442104c9a92294996bd32c2df703c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 06:08:21 +0000 Subject: [PATCH 16/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- hashcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index 2aae459..ef2e795 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.6 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT AND LicenseRef-Fedora-Public-Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 6.2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 6.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c98f168541345a1249d211d63703699a0b0c24ca Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Mon, 4 Dec 2023 16:02:57 +0000 Subject: [PATCH 17/29] Rebuilt for minizip-ng transition Fedora change Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition --- hashcat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index ef2e795..2c93928 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.6 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT AND LicenseRef-Fedora-Public-Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,10 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Mon Dec 04 2023 Lukas Javorsky - 6.2.6-4 +- Rebuilt for minizip-ng transition Fedora change +- Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition + * Thu Jul 20 2023 Fedora Release Engineering - 6.2.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e7af8a89661fa5213e7b0459064d04d72678cb79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 21:58:09 +0000 Subject: [PATCH 18/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- hashcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index 2c93928..3ba96b8 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.6 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT AND LicenseRef-Fedora-Public-Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 6.2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 04 2023 Lukas Javorsky - 6.2.6-4 - Rebuilt for minizip-ng transition Fedora change - Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition From 97e7f0afdd8b6a7d64cb51956de4e111c2f280bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 21:31:52 +0000 Subject: [PATCH 19/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- hashcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index 3ba96b8..08604e7 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.6 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT AND LicenseRef-Fedora-Public-Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 6.2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 6.2.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5752b1cf27be5835f26db2d9ca5ccb2c63d7caf4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 09:06:35 +0000 Subject: [PATCH 20/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- hashcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index 08604e7..ae0a6c4 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.6 -Release: 6%{?dist} +Release: 7%{?dist} License: MIT AND LicenseRef-Fedora-Public-Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 6.2.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 6.2.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5b6e6c1d5e3028ab8ad53bdb40ff547dd9418cbd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 05:46:45 +0000 Subject: [PATCH 21/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- hashcat.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index ae0a6c4..c1b391d 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.6 -Release: 7%{?dist} +Release: 8%{?dist} License: MIT AND LicenseRef-Fedora-Public-Domain URL: https://github.com/%{name}/%{name} @@ -112,6 +112,9 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 6.2.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 6.2.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9ee4ab8c106a03b9f0bdf26238c992e35b0919a1 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 21 Jan 2025 21:53:55 +0100 Subject: [PATCH 22/29] Converted to %autorelease and %autochangelog. [skip changelog] --- changelog | 2 ++ hashcat.spec | 51 ++------------------------------------------------- 2 files changed, 4 insertions(+), 49 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..c706018 --- /dev/null +++ b/changelog @@ -0,0 +1,2 @@ +* Fri Jan 17 2025 Fedora Release Engineering - 6.2.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/hashcat.spec b/hashcat.spec index c1b391d..c0c6c05 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -17,7 +17,7 @@ Name: hashcat Version: 6.2.6 -Release: 8%{?dist} +Release: %autorelease License: MIT AND LicenseRef-Fedora-Public-Domain URL: https://github.com/%{name}/%{name} @@ -112,51 +112,4 @@ install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash- %doc example.dict example*.sh %changelog -* Fri Jan 17 2025 Fedora Release Engineering - 6.2.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 6.2.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 6.2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 6.2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 04 2023 Lukas Javorsky - 6.2.6-4 -- Rebuilt for minizip-ng transition Fedora change -- Fedora Change: https://fedoraproject.org/wiki/Changes/MinizipNGTransition - -* Thu Jul 20 2023 Fedora Release Engineering - 6.2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 6.2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Sep 02 2022 Vitaly Zaitsev - 6.2.6-1 -- Updated to version 6.2.6. - -* Thu Jul 21 2022 Fedora Release Engineering - 6.2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 6.2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sun Nov 21 2021 Vitaly Zaitsev - 6.2.5-1 -- Updated to version 6.2.5. - -* Mon Aug 30 2021 Vitaly Zaitsev - 6.2.4-1 -- Updated to version 6.2.4. - -* Thu Jul 22 2021 Fedora Release Engineering - 6.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 17 2021 Vitaly Zaitsev - 6.2.3-1 -- Updated to version 6.2.3. - -* Sun Jun 13 2021 Vitaly Zaitsev - 6.2.2-1 -- Updated to version 6.2.2. - -* Sat May 15 2021 Vitaly Zaitsev - 6.2.1-1 -- Updated to version 6.2.1. +%autochangelog From d3a7cfdfdcf4f2d00e7f94312f3db4fbe64862fa Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 21 Jan 2025 21:57:56 +0100 Subject: [PATCH 23/29] Disabled 32-bit build and removed all weak dependencies due to known issues with some OpenCL implementations. --- hashcat.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/hashcat.spec b/hashcat.spec index c0c6c05..d099274 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -43,14 +43,9 @@ Provides: bundled(zlib) = 1.2.11 Provides: bundled(minizip) = 1.2.11 %endif -%if 0%{?fedora} -Recommends: mesa-libOpenCL%{?_isa} -Recommends: pocl%{?_isa} -Recommends: %{name}-doc = %{?epoch:%{epoch}:}%{version}-%{release} -%endif - # Upstream does not support Big Endian architectures. -ExcludeArch: ppc64 s390x +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} ppc64 s390x %description Hashcat is the world's fastest and most advanced password recovery From f40f46d50a58fcb17e78d48ab4a72d784287aeeb Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 21 Jan 2025 23:00:09 +0100 Subject: [PATCH 24/29] Added a weak dependency on documentation subpackage. --- hashcat.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hashcat.spec b/hashcat.spec index d099274..23cfb36 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -43,6 +43,8 @@ Provides: bundled(zlib) = 1.2.11 Provides: bundled(minizip) = 1.2.11 %endif +Recommends: %{name}-doc + # Upstream does not support Big Endian architectures. # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} ppc64 s390x From e0884b6e1be965b9a34219e8a8249063d7917cea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:54:54 +0000 Subject: [PATCH 25/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 785fb2a2ac9d97f415c9c0d426484e7bc4788931 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Tue, 28 Oct 2025 22:22:15 -0700 Subject: [PATCH 26/29] Update to 7.1.2 (rhbz#2386082) --- .fmf/version | 1 + gating.yaml | 16 +++++++++++ hashcat-build-fixes.patch | 59 ++++++++++++++++++++++++++++----------- hashcat.spec | 17 ++++++++--- plans/main.fmf | 5 ++++ sources | 2 +- tests/core/main.fmf | 1 + tests/core/test.sh | 19 +++++++++++++ tests/main.fmf | 4 +++ 9 files changed, 102 insertions(+), 22 deletions(-) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/main.fmf create mode 100644 tests/core/main.fmf create mode 100755 tests/core/test.sh create mode 100644 tests/main.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..4b79bd1 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,16 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional} + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index ba88c2a..657c212 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,17 +1,17 @@ -From 49d6ac344d249941a0592113259a2af82914e319 Mon Sep 17 00:00:00 2001 -From: Vitaly Zaitsev -Date: Wed, 17 Jun 2020 10:57:15 +0200 -Subject: [PATCH] Fedora build patches. +From 1b530558da4019541863848937f58e66089c2b42 Mon Sep 17 00:00:00 2001 +From: Carlos Rodriguez-Fernandez +Date: Tue, 21 Oct 2025 21:23:00 -0700 +Subject: [PATCH] fixes --- - src/Makefile | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) + src/Makefile | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 64f54dbf6..c0d587b35 100644 +index 72986407c..4fe3d9eb7 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -43,7 +43,7 @@ endif +@@ -52,7 +52,7 @@ endif ## Makefile flags ## @@ -20,7 +20,16 @@ index 64f54dbf6..c0d587b35 100644 ifneq ($(findstring clean,$(MAKECMDGOALS)),) MAKEFLAGS += -j 1 -@@ -233,10 +233,7 @@ endif +@@ -167,8 +167,6 @@ DEPS_UNRAR_PATH := $(LIBRARY_DEV_ROOT_FOLDER) + endif + endif + +-DEPS_SSE2NEON := deps/sse2neon +- + ## + ## Filenames for library and frontend + ## +@@ -275,10 +273,7 @@ endif endif ifeq ($(DEBUG),0) @@ -32,24 +41,40 @@ index 64f54dbf6..c0d587b35 100644 else ifeq ($(DEBUG),1) ifneq ($(UNAME),Darwin) -@@ -505,7 +502,7 @@ endif +@@ -427,7 +422,6 @@ endif # Darwin + + ifeq ($(IS_ARM),1) + CFLAGS_NATIVE += -DSSE2NEON_SUPPRESS_WARNINGS +-CFLAGS_NATIVE += -I$(DEPS_SSE2NEON) + endif + + ifeq ($(UNAME),CYGWIN) +@@ -589,7 +583,7 @@ endif .PHONY: install ifeq ($(SHARED),1) --install: install_docs install_shared install_library install_library_dev install_tunings install_kernels install_modules install_hashcat -+install: install_shared install_library install_library_dev install_tunings install_kernels install_modules install_hashcat +-install: install_docs install_shared install_tools install_library install_library_dev install_tunings install_kernels install_modules install_bridges install_hashcat ++install: install_shared install_library install_library_dev install_tunings install_kernels install_modules install_bridges install_hashcat else - install: install_docs install_shared install_tunings install_kernels install_modules install_hashcat + install: install_docs install_shared install_tools install_tunings install_kernels install_modules install_bridges install_hashcat endif -@@ -578,7 +575,7 @@ install_kernels: install_shared +@@ -660,7 +654,7 @@ install_kernels: install_shared install_modules: install_shared modules $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules $(FIND) modules/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; - $(FIND) modules/ -mindepth 1 -type f -execdir $(INSTALL) -m 644 {} $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; + $(FIND) modules/ -mindepth 1 -type f -execdir $(INSTALL) -m 755 {} $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; - .PHONY: install_library - install_library: $(HASHCAT_LIBRARY) + .PHONY: install_bridges + install_bridges: install_shared bridges +@@ -892,7 +886,6 @@ endif + + ifeq ($(IS_ARM),1) + CFLAGS_CROSS_LINUX += -DSSE2NEON_SUPPRESS_WARNINGS +-CFLAGS_CROSS_LINUX += -I$(DEPS_SSE2NEON) + endif + + ## -- -2.37.2 +2.51.0 diff --git a/hashcat.spec b/hashcat.spec index 23cfb36..b332271 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -16,10 +16,10 @@ %endif Name: hashcat -Version: 6.2.6 +Version: 7.1.2 Release: %autorelease -License: MIT AND LicenseRef-Fedora-Public-Domain +License: MIT AND LicenseRef-Fedora-Public-Domain AND BSD-2-Clause AND Apache-2.0 URL: https://github.com/%{name}/%{name} Summary: Advanced password recovery utility @@ -32,16 +32,24 @@ Patch0: %{name}-build-fixes.patch BuildRequires: opencl-headers BuildRequires: xxhash-devel +%ifarch aarch64 +BuildRequires: sse2neon-devel +%endif + BuildRequires: gcc BuildRequires: make %if %{with zlib} -BuildRequires: zlib-devel +BuildRequires: zlib-ng-compat-devel BuildRequires: minizip-compat-devel %else Provides: bundled(zlib) = 1.2.11 Provides: bundled(minizip) = 1.2.11 %endif +Provides: bundled(lzma-sdk) = 24.09 +Provides: bundled(scrypt-jane) +Provides: bundled(yescrypt) +Provides: bundled(libargo2) = 20190702 Recommends: %{name}-doc @@ -74,7 +82,7 @@ BuildArch: noarch %prep %autosetup -p1 -rm -rf deps/{OpenCL-Headers,xxHash} +rm -rf deps/{OpenCL-Headers,xxHash,sse2neon} %if %{with zlib} rm -rf deps/zlib %endif @@ -91,6 +99,7 @@ rm -f modules/.lock ln -s lib%{name}.so.%{version} %{buildroot}%{_libdir}/lib%{name}.so mkdir -p %{buildroot}%{_datadir}/bash-completion/completions install -m 0744 -p extra/tab_completion/hashcat.sh %{buildroot}%{_datadir}/bash-completion/completions/%{name} +find %{buildroot}%{_libdir}/%{name}/ -name '.gitkeep' -type f -delete %files %license docs/license.txt diff --git a/plans/main.fmf b/plans/main.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/main.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/sources b/sources index 403430d..776ee7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (hashcat-6.2.6-clean.tar.xz) = 3c7bdf4209d28bf5bc62d43ea4bb44a158a0226769ec9e1e9b92571fdfd0f1f89ee581edddb6582491e5cc8f44becde13b9caf8a169ed766c79bc114dc204a9f +SHA512 (hashcat-7.1.2-clean.tar.xz) = 39d525d8f835227a2d9a081ce5b96eabebeff15f10707115f94339f9edd55228885dcd151ace9132e937147318d44447dbb53f8c05b3048f5cb24d620a4f00af diff --git a/tests/core/main.fmf b/tests/core/main.fmf new file mode 100644 index 0000000..78884f4 --- /dev/null +++ b/tests/core/main.fmf @@ -0,0 +1 @@ +summary: hashcat cli smoke test diff --git a/tests/core/test.sh b/tests/core/test.sh new file mode 100755 index 0000000..ffd8682 --- /dev/null +++ b/tests/core/test.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartTest + rlRun "hashcat --version" 0 "version info" + rlPhaseEnd + + rlPhaseStartTest + rlRun -s "hashcat --help" 0 "help" + rlAssertGrep "Usage" "$rlRun_LOG" + rlPhaseEnd + + rlPhaseStartTest + rlRun -s "hashcat --hash-info" 0 "hash info" + rlAssertGrep "Hash Info" "$rlRun_LOG" + rlPhaseEnd +rlJournalEnd diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..f61588b --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,4 @@ +summary: hashcat smoke test +test: ./test.sh +framework: beakerlib +require: ["hashcat"] \ No newline at end of file From c97bfc2aa017c34388f4400e3fad3757b4892720 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Tue, 28 Oct 2025 22:35:15 -0700 Subject: [PATCH 27/29] Correct bundled dep name --- hashcat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hashcat.spec b/hashcat.spec index b332271..85156a1 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -49,7 +49,7 @@ Provides: bundled(minizip) = 1.2.11 Provides: bundled(lzma-sdk) = 24.09 Provides: bundled(scrypt-jane) Provides: bundled(yescrypt) -Provides: bundled(libargo2) = 20190702 +Provides: bundled(libargon2) = 20190702 Recommends: %{name}-doc From f2640fe2a862148c3f0788dc5e57a3440643a1eb Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Wed, 29 Oct 2025 14:56:40 -0700 Subject: [PATCH 28/29] Remove ppc64le build --- hashcat-build-fixes.patch | 4 ++-- hashcat.spec | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index 657c212..9ac7917 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,6 +1,6 @@ -From 1b530558da4019541863848937f58e66089c2b42 Mon Sep 17 00:00:00 2001 +From 941717c93cd5383c48b5be213436beebb419bbca Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez -Date: Tue, 21 Oct 2025 21:23:00 -0700 +Date: Wed, 29 Oct 2025 12:15:25 -0700 Subject: [PATCH] fixes --- diff --git a/hashcat.spec b/hashcat.spec index 85156a1..3569ac3 100644 --- a/hashcat.spec +++ b/hashcat.spec @@ -7,7 +7,7 @@ %bcond_with zlib %endif -%global makeflags PREFIX=%{_prefix} LIBRARY_FOLDER=%{_libdir} SHARED_ROOT_FOLDER=%{_libdir} DOCUMENT_FOLDER=%{_docdir}/hashcat-doc SHARED=1 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 ENABLE_UNRAR=0 +%global makeflags PREFIX=%{_prefix} LIBRARY_FOLDER=%{_libdir} SHARED_ROOT_FOLDER=%{_libdir} DOCUMENT_FOLDER=%{_docdir}/hashcat-doc SHARED=1 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 ENABLE_UNRAR=0 MAINTAINER_MODE=1 %if %{with zlib} %global makeflags %(echo %{makeflags} USE_SYSTEM_ZLIB=1) @@ -54,8 +54,9 @@ Provides: bundled(libargon2) = 20190702 Recommends: %{name}-doc # Upstream does not support Big Endian architectures. +# Upstream source code does not longer build for ppc64le: https://bugzilla.redhat.com/show_bug.cgi?id=2407234 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval -ExcludeArch: %{ix86} ppc64 s390x +ExcludeArch: %{ix86} ppc64 s390x ppc64le %description Hashcat is the world's fastest and most advanced password recovery From 53a410c00c3bad02f71f660efcf96aea500a3679 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Wed, 29 Oct 2025 18:40:18 -0700 Subject: [PATCH 29/29] Fix bridges debuginfo --- hashcat-build-fixes.patch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/hashcat-build-fixes.patch b/hashcat-build-fixes.patch index 9ac7917..737994a 100644 --- a/hashcat-build-fixes.patch +++ b/hashcat-build-fixes.patch @@ -1,14 +1,14 @@ -From 941717c93cd5383c48b5be213436beebb419bbca Mon Sep 17 00:00:00 2001 +From d4ebb8d60a87a638c20fa1de1b4560142a69feb5 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez-Fernandez Date: Wed, 29 Oct 2025 12:15:25 -0700 Subject: [PATCH] fixes --- - src/Makefile | 15 ++++----------- - 1 file changed, 4 insertions(+), 11 deletions(-) + src/Makefile | 17 +++++------------ + 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 72986407c..4fe3d9eb7 100644 +index 72986407c..49cbaf924 100644 --- a/src/Makefile +++ b/src/Makefile @@ -52,7 +52,7 @@ endif @@ -58,7 +58,7 @@ index 72986407c..4fe3d9eb7 100644 else install: install_docs install_shared install_tools install_tunings install_kernels install_modules install_bridges install_hashcat endif -@@ -660,7 +654,7 @@ install_kernels: install_shared +@@ -660,13 +654,13 @@ install_kernels: install_shared install_modules: install_shared modules $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules $(FIND) modules/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/modules/{} \; @@ -67,6 +67,13 @@ index 72986407c..4fe3d9eb7 100644 .PHONY: install_bridges install_bridges: install_shared bridges + $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/bridges + $(FIND) bridges/ -mindepth 1 -type d -execdir $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/bridges/{} \; +- $(FIND) bridges/ -mindepth 1 -type f -execdir $(INSTALL) -m 644 {} $(DESTDIR)$(SHARED_FOLDER)/bridges/{} \; ++ $(FIND) bridges/ -mindepth 1 -type f -execdir $(INSTALL) -m 755 {} $(DESTDIR)$(SHARED_FOLDER)/bridges/{} \; + + .PHONY: install_library + install_library: $(HASHCAT_LIBRARY) @@ -892,7 +886,6 @@ endif ifeq ($(IS_ARM),1)