Merge pull request #163 from X0RW3LL/main

Fix Python 3.12 SyntaxWarning (use raw strings)

Author: skelsec

pypykatz/_version.py

@@ -8,7 +8,7 @@
 """ % __version__
 
 __logo__ = \
-"""
+r"""
                  &.          
                  @@@@@       
    ///////\\       @@@@@@@    
@@ -33,4 +33,4 @@
 \x1b[38;5;118m \\\x1b[38;5;106m((((          \x1b[38;5;240m@@@@@@@@@@@@@\x1b[0m
 \x1b[38;5;118m   \\\\\x1b[38;5;106m((((((\x1b[38;5;240m.@@@@@@@@@@@@@@@@ \x1b[0m
 ------ \x1b[38;5;196mP Y P Y K A T Z\x1b[0m ------
-"""
+"""

pypykatz/commons/winapi/machine.py

@@ -32,13 +32,13 @@ def __init__(self, api = None):
 
 	def get_hostname(self):
 		if self.hostname is None:
-			params = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters')
+			params = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters')
 			self.hostname = winreg.QueryValueEx(params, 'NV Hostname')[0]
 		return self.hostname
 
 	def get_domain(self):
 		if self.domain is None:
-			params = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters')
+			params = winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, r'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters')
 			self.domain = winreg.QueryValueEx(params, 'Domain')[0]
 		return self.domain
 
@@ -119,4 +119,4 @@ def list_all_pids(self):
 	#for srv in t:
 	#	print(str(t[sid]))
 	#t = u.get_current_user()
-	#print(str(t))
+	#print(str(t))

pypykatz/dpapi/dpapi.py

@@ -42,7 +42,7 @@
 if platform.system().lower() == 'windows':
 	from pypykatz.commons.winapi.processmanipulator import ProcessManipulator
 
-"""
+r"""
 So! DPAPI...
 
 In order to decrpyt a file/blob/data of any kind you must obtain a masterkey.
@@ -517,7 +517,7 @@ def decrypt_blob_bytes(self, data, key = None, entropy = None):
 		return self.decrypt_blob(blob, key = key, entropy = entropy)
 
 	def decrypt_vcrd_file(self, file_path):
-		"""
+		r"""
 		Decrypts a VCRD file
 		Location: %APPDATA%\Local\Microsoft\Vault\%GUID%\<>.vcrd
 		
@@ -586,7 +586,7 @@ def decrypt_vpol_bytes(self, data, entropy = None):
 		return keys.key1.get_key(), keys.key2.get_key()
 
 	def decrypt_vpol_file(self, file_path):
-		"""
+		r"""
 		Decrypts a VPOL file
 		Location: %APPDATA%\Local\Microsoft\Vault\%GUID%\<>.vpol