Unverified Commit c6b95499 authored by Pavol Rusnak's avatar Pavol Rusnak Committed by GitHub
Browse files

hashcat: 7.0.0 -> 7.1.2 (#434999)

parents f68d5713 47562bbe
Loading
Loading
Loading
Loading
+0 −42
Original line number Diff line number Diff line
diff --git a/tools/bitlocker2hashcat.py b/tools/bitlocker2hashcat.py
index f7501a37b..a72fb8c78 100755
--- a/tools/bitlocker2hashcat.py
+++ b/tools/bitlocker2hashcat.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Construct a hash for use with hashcat mode 22100
 # Usage: python3 bitlocker2hashcat.py <bitlocker_image> -o <bitlocker_partition_offset>
 # Hashcat supports modes $bitlocker$0$ and $bitlocker$1$ and therefore this script will output hashes that relate to a VMK protected by a user password only.
diff --git a/tools/keybag2hashcat.py b/tools/keybag2hashcat.py
index 83da25c5e..6a30384ac 100755
--- a/tools/keybag2hashcat.py
+++ b/tools/keybag2hashcat.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import argparse
 import logging
 import sys
diff --git a/tools/shiro1-to-hashcat.py b/tools/shiro1-to-hashcat.py
old mode 100755
new mode 100644
index 9619530ef..86ee8e502
--- a/tools/shiro1-to-hashcat.py
+++ b/tools/shiro1-to-hashcat.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import os
 import re
 import glob
diff --git a/tools/veeamvbk2hashcat.py b/tools/veeamvbk2hashcat.py
index e8d6ac05c..5f6d1977a 100755
--- a/tools/veeamvbk2hashcat.py
+++ b/tools/veeamvbk2hashcat.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import argparse
 import binascii
 
+6 −10
Original line number Diff line number Diff line
@@ -21,25 +21,21 @@

stdenv.mkDerivation rec {
  pname = "hashcat";
  version = "7.0.0";
  version = "7.1.2";

  src = fetchurl {
    url = "https://hashcat.net/files/hashcat-${version}.tar.gz";
    sha256 = "sha256-hCtx0NNLAgAFiCR6rp/smg/BMnfyzTpqSSWw8Jszv3U=";
    sha256 = "sha256-lUamMm10dTC0T8wHm6utQDBKh/MtPJCAAW1Ys5z8i5Y=";
  };

  patches = [
    ./0001-python-shebangs.patch
  ];

  postPatch = ''
     # MACOSX_DEPLOYMENT_TARGET is defined by the enviroment
     # Remove hardcoded paths on darwin
    substituteInPlace src/Makefile \
      --replace "export MACOSX_DEPLOYMENT_TARGET" "#export MACOSX_DEPLOYMENT_TARGET" \
      --replace "/usr/bin/ar" "ar" \
      --replace "/usr/bin/sed" "sed" \
      --replace '-i ""' '-i'
      --replace-fail "export MACOSX_DEPLOYMENT_TARGET" "#export MACOSX_DEPLOYMENT_TARGET" \
      --replace-fail "/usr/bin/ar" "ar" \
      --replace-fail "/usr/bin/sed" "sed" \
      --replace-fail '-i ""' '-i'
  '';

  nativeBuildInputs = [