From 73abdec354cb1d9849f22c54af1dfb52645ccf6b Mon Sep 17 00:00:00 2001 From: kStor2poche <43518872+kStor2poche@users.noreply.github.com> Date: Thu, 24 Oct 2024 10:58:07 +0200 Subject: [PATCH] Add SSLKEYLOGFILE dumping --- src/keyfinder/finder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/keyfinder/finder.py b/src/keyfinder/finder.py index 3da11d8..2708dba 100644 --- a/src/keyfinder/finder.py +++ b/src/keyfinder/finder.py @@ -12,7 +12,7 @@ import shutil import subprocess import time -from tempfile import NamedTemporaryFile +from datetime import datetime from typing import Dict, List, Tuple, Union from src.keyfinder.tshark_keytester import TsharkKeyTester @@ -323,8 +323,8 @@ def get_command_sha256(self, command: str) -> Union[str, None]: return binary_hash - @staticmethod def edit_pcap( + self, dump_file: str, ssl_key_log_file_content: str, capture_comment: str) -> None: @@ -335,8 +335,8 @@ def edit_pcap( os.environ.get("CUSTOM_WIRESHARK_BIN_PATH", "/opt/wireshark-custom/bin"), "editcap" ) - with NamedTemporaryFile(buffering=0) as keylog: - keylog.write(ssl_key_log_file_content.encode("ascii")) + with open(os.path.join(self.dump_directory, os.environ.get("SSLKEYLOG_FILENAME", f"{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}_sslkeylogfile")), "wt") as keylog: + _ = keylog.write(ssl_key_log_file_content) try: subprocess.run( [