Merge branch 'HashPals:main' into main

.github/dependabot.yml

@@ -5,7 +5,3 @@ updates:
   schedule:
     interval: daily
   open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: rich
-    versions:
-    - 10.0.0

.github/workflows/python.yaml

@@ -1,20 +1,30 @@
 # .github/workflows/tests.yml
 name: Tests
-on: pull_request
+
+on: [push, pull_request]
+
 jobs:
   tests:
+    name: Python ${{ matrix.python-version }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
         os: [ubuntu-latest, windows-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
-    name: Python ${{ matrix.python-version }}
+
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-        architecture: x64
-    - run: pip install nox==2019.11.9
-    - run: pip install poetry==1.0.5
-    - run: nox
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
+
+      - name: nox
+        run: |
+          pip install nox
+          pip install poetry
+          nox

name_that_hash/hashes.py

@@ -4,6 +4,7 @@
 
 Prototype = namedtuple("Prototype", ["regex", "modes"])
 
+
 @dataclass
 class HashInfo:
     name: str
@@ -2420,4 +2421,26 @@ class HashInfo:
             ),
         ],
     ),
+    Prototype(
+        regex=re.compile(r"\$bitlocker\$[0-9]\$[0-9]{2}\$[a-f0-9]{32}\$[a-f0-9]{7}\$[a-f0-9]{2}\$[a-f0-9]{24}\$[a-f0-9]{2}\$[a-f0-9]{120}", re.IGNORECASE),
+        modes=[
+            HashInfo(
+                name="BitLocker",
+                hashcat=22100,
+                john="bitlocker",
+                extended=False
+            ),
+        ]
+    ),
+    Prototype(
+        regex=re.compile(r"\$racf\$\*.{1,}\*[A-F0-9]{16}", re.IGNORECASE),
+        modes=[
+            HashInfo(
+                name="RACF",
+                hashcat=8500,
+                john=None,
+                extended=False
+            ),
+        ]
+    ),
 ]

pyproject.toml

@@ -6,12 +6,12 @@ authors = ["brandon <[email protected]>"]
 license = "GPL-3.0-or-later"
 
 [tool.poetry.dependencies]
-python = "^3.6"
-click = ">=7.1.2,<9.0.0"
-rich = ">=9.9,<11.0"
+python = "^3.6.2"
+click = ">=7.1.2"
+rich = ">=11.0.0"
 
 [tool.poetry.dev-dependencies]
-pytest = "^6.2"
+pytest = "^7.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]