Merge branch 'main' into marshall-get-gpos

Pennyw0rth · Jan 17, 2025 · c641137 · c641137
2 parents 3afcbbe + a5ec90e
commit c641137
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/netexec.spec b/netexec.spec
@@ -30,6 +30,7 @@ a = Analysis(
         'impacket.tds',
         'impacket.version',
         'impacket.ldap.ldap',
+        'jwt',
         'nxc.connection',
         'nxc.servers.smb',
         'nxc.protocols.smb.wmiexec',
@@ -71,6 +72,7 @@ a = Analysis(
         'dploot.triage.masterkeys',
         'dploot.triage.mobaxterm',
         'dploot.triage.backupkey',
+        'dploot.triage.wam',
         'dploot.triage.wifi',
         'dploot.triage.sccm',
         'dploot.lib.target',

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -41,7 +41,7 @@ argcomplete = "^3.1.4"
 asyauth = ">=0.0.20"
 beautifulsoup4 = ">=4.11,<5"
 bloodhound = "^1.8.0"
-dploot = "^3.0.3"
+dploot = "^3.1.0"
 dsinternals = "^1.2.4"
 impacket =  { git = "https://github.com/fortra/impacket.git" }
 jwt = ">=1.3.1"
@@ -51,6 +51,7 @@ minikerberos = "^0.4.1"
 msgpack = "^1.0.0"
 msldap = "^0.5.10"
 neo4j = "^5.0.0"
+oscrypto = { git = "https://github.com/wbond/oscrypto" }
 paramiko = "^3.3.1"
 poetry-dynamic-versioning = "^1.2.0"
 pyasn1-modules = "^0.3.0"