signtool: Allow bitness fallback

Author: deajan

windows_tools/signtool/__init__.py

@@ -18,19 +18,22 @@
 __copyright__ = "Copyright (C) 2020-2024 Orsiris de Jong"
 __description__ = "Windows authenticode signature tool"
 __licence__ = "BSD 3 Clause"
-__version__ = "0.5.0"
-__build__ = "2024090801"
+__version__ = "0.6.0"
+__build__ = "2025051201"
 
 import os
 import sys
-
+from logging import getLogger
 from typing import Optional, Union
 from command_runner import command_runner
 from ofunctions.file_utils import get_paths_recursive
 from ofunctions.network import check_http_internet
 from windows_tools.bitness import is_64bit, is_64bit_executable
 
 
+logger = getLogger()
+
+
 CURRENT_EXECUTABLE = os.path.abspath(sys.argv[0])
 CURRENT_DIR = os.path.dirname(CURRENT_EXECUTABLE)
 dont_sign_file = os.path.join(CURRENT_DIR, "signtool.err.log")
@@ -141,7 +144,7 @@ def get_timestamp_server(self):
             "http://timestamp.globalsign.com/scripts/timstamp.dll",
         ]
         for server in ts_servers:
-            if check_http_internet([server]):
+            if check_http_internet(fqdn_servers=[server]):
                 self.authority_timestamp_url = server
                 return True
         raise ValueError("No online timeserver found")
@@ -158,12 +161,10 @@ def sign(
         elif bitness in [64, "64", "x64"]:
             signtool = os.environ.get("SIGNTOOL_X64", self.detect_signtool("x64"))
         else:
-            if not bitness:
-                raise ValueError(
-                    "Cannot autodetect bitness. Please specify bitness or install win32file"
+            logger.info(
+                f"Cannot autodetect bitness of executable {executable}. Defaulting to 64 bit signtool"
                 )
-            else:
-                raise ValueError("Bogus bitness.")
+
 
         if not os.path.exists(signtool):
             raise EnvironmentError("Could not find valid signtool.exe")
@@ -184,7 +185,6 @@ def sign(
         cmd += ' "{}"'.format(executable)
 
         if dry_run:
-            print("DRY RUN: {}".format(cmd))
             return True
         else:
             # Make sure we don't sign automatically in order to prevent an EV certificate token to be blocked because of bogus password attempts

windows_tools/signtool/requirements.txt

@@ -1,6 +1,6 @@
 ofunctions.file_utils>=1.0.2
 ofunctions.network>=1.3.2
 command_runner>=1.2.1
-windows_tools.bitness>=0.2.0
+windows_tools.bitness>=0.2.1
 ofunctions.file_utils
-ofunctions.network>=1.6.0
+ofunctions.network>=1.6.1