Merge branch 'master' into develop

stfbk · Dec 18, 2024 · 074d409 · 074d409
2 parents 57bcf7b + 502def3
commit 074d409
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/modules/server/tlsfuzzer_base.py b/modules/server/tlsfuzzer_base.py
@@ -180,7 +180,6 @@ def run(self, **kwargs):
         testssl_args = {"hostname": self._input_dict["hostname"]+":"+self._input_dict["port"],
                         "args": ["-e", "-p"],
                         }
-        hostname_cache = cache_name(self._input_dict["hostname"], self._input_dict["port"])
         self._testssl.run(**testssl_args, force=True)
         logging.debug(
             f"Executing analysis in {self._input_dict['hostname']} in port {self._input_dict['port']} with scripts "

diff --git a/modules/server/wrappers/testssl.py b/modules/server/wrappers/testssl.py
@@ -156,7 +156,7 @@ def __update_cache(self, cache, ip_cache):
             else:
                 for ip in cache[site]:
                     self.__cache[site][ip] = self.__merge(
-                        self.__cache[site][ip], cache[site][ip]
+                        self.__cache[site].get(ip, {}), cache[site][ip]
                     )  # if present, merge
         self.__ip_cache.update(ip_cache)
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,7 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.8"
-aiohttp = "3.10.2"
+aiohttp = "3.10.11"
 tldextract = "3.1.0"
 apacheconfig = "0.3.2"
 crossplane = "0.5.7"

diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,10 @@
-aiohttp==3.9.4
+aiohttp==3.10.11
 apacheconfig==0.3.2
 crossplane==0.5.7
 tlslite-ng==0.8.0-beta5
 jsonmerge==1.8.0
 markdown2==2.4.0
-Jinja2==3.1.3
+Jinja2==3.1.4
 stix2==3.0.1
 stix2-patterns==1.3.2
 pyopenssl==24.1.0