Skip to content

Add support for pystandalone key_fingerprint #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 16, 2025
Merged

Add support for pystandalone key_fingerprint #235

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ceb14b0
Add support for pystandalone key_fingerprint
Miauwkeru Apr 16, 2025
49dec65
Update acquire/crypt.py
Miauwkeru Apr 16, 2025
f9695a7
Replace 0 with O
Miauwkeru Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions acquire/crypt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import io
import os
from datetime import datetime, timezone
from typing import BinaryIO
from typing import Any, BinaryIO

from dissect.cstruct import cstruct

Expand Down Expand Up @@ -151,9 +151,11 @@
self.cipher.clean()


def key_fingerprint(pkey: PKCS1_OAEP.PKCS1OAEP_Cipher) -> bytes:
if isinstance(pkey, PKCS1_OAEP.PKCS1OAEP_Cipher):
pkey = pkey._key
der = pkey.export_key("DER")

def key_fingerprint(pkey: PKCS1_OAEP.PKCS1OAEP_Cipher | Any) -> bytes:
if HAS_PYSTANDALONE:
der = pkey.der()

Check warning on line 156 in acquire/crypt.py

View check run for this annotation

Codecov / codecov/patch

acquire/crypt.py#L156 

Added line #L156 was not covered by tests
else:
if isinstance(pkey, PKCS1_OAEP.PKCS1OAEP_Cipher):
pkey = pkey._key
der = pkey.export_key("DER")
return hashlib.sha256(der).digest()
Loading