Merge pull request #31 from skelsec/main

Main

Author: skelsec

builder/pyinstaller/build.bat

@@ -1,26 +1,38 @@
 @echo off
+set projectname=minikerberos
 set hiddenimports= --hidden-import cryptography --hidden-import cffi --hidden-import cryptography.hazmat.backends.openssl --hidden-import cryptography.hazmat.bindings._openssl --hidden-import unicrypto --hidden-import unicrypto.backends.pycryptodome.DES --hidden-import  unicrypto.backends.pycryptodome.TDES --hidden-import unicrypto.backends.pycryptodome.AES --hidden-import unicrypto.backends.pycryptodome.RC4 --hidden-import unicrypto.backends.pure.DES --hidden-import  unicrypto.backends.pure.TDES --hidden-import unicrypto.backends.pure.AES --hidden-import unicrypto.backends.pure.RC4 --hidden-import unicrypto.backends.cryptography.DES --hidden-import  unicrypto.backends.cryptography.TDES --hidden-import unicrypto.backends.cryptography.AES --hidden-import unicrypto.backends.cryptography.RC4 --hidden-import unicrypto.backends.pycryptodomex.DES --hidden-import  unicrypto.backends.pycryptodomex.TDES --hidden-import unicrypto.backends.pycryptodomex.AES --hidden-import unicrypto.backends.pycryptodomex.RC4
 set root=%~dp0
-set projectname=minikerberos
-set pyenv=%root%\env
 set repo=%root%..\..\%projectname%
-python -m venv %pyenv%
-%pyenv%\Scripts\activate.bat &^
-pip install pyinstaller &^
-cd %repo%\..\ &^
-pip install . &^
-cd %repo%\examples &^
-pyinstaller -F ccache_editor.py %hiddenimports% &^
-pyinstaller -F ccache2kirbi.py %hiddenimports% &^
-pyinstaller -F ccacheroast.py %hiddenimports% &^
-pyinstaller -F CVE_2022_33647.py %hiddenimports% &^
-pyinstaller -F CVE_2022_33679.py %hiddenimports% &^
-pyinstaller -F getNT.py %hiddenimports% &^
-pyinstaller -F getS4U2proxy.py %hiddenimports% &^
-pyinstaller -F getS4U2self.py %hiddenimports% &^
-pyinstaller -F getTGS.py %hiddenimports% &^
-pyinstaller -F getTGT.py %hiddenimports% &^
-pyinstaller -F kerb23hashdecrypt.py %hiddenimports% &^
-pyinstaller -F kirbi2ccache.py %hiddenimports% &^
-pyinstaller -F spnroast.py %hiddenimports% &^
-cd %repo%\examples\dist & copy *.exe %root%\
+IF NOT DEFINED __BUILDALL_VENV__ (GOTO :CREATEVENV)
+GOTO :BUILD
+
+:CREATEVENV
+python -m venv %root%\env
+CALL %root%\env\Scripts\activate.bat
+pip install pyinstaller
+GOTO :BUILD
+
+:BUILD
+cd %repo%\..\
+pip install .
+cd %repo%\examples
+pyinstaller -F ccache_editor.py %hiddenimports%
+pyinstaller -F ccache2kirbi.py %hiddenimports%
+pyinstaller -F ccacheroast.py %hiddenimports%
+pyinstaller -F CVE_2022_33647.py %hiddenimports%
+pyinstaller -F CVE_2022_33679.py %hiddenimports%
+pyinstaller -F getNT.py %hiddenimports%
+pyinstaller -F getS4U2proxy.py %hiddenimports%
+pyinstaller -F getS4U2self.py %hiddenimports%
+pyinstaller -F getTGS.py %hiddenimports%
+pyinstaller -F getTGT.py %hiddenimports%
+pyinstaller -F kerb23hashdecrypt.py %hiddenimports%
+pyinstaller -F kirbi2ccache.py %hiddenimports%
+pyinstaller -F spnroast.py %hiddenimports%
+cd %repo%\examples\dist & copy *.exe %root%\
+GOTO :CLEANUP
+
+:CLEANUP
+IF NOT DEFINED __BUILDALL_VENV__ (deactivate)
+cd %root%
+EXIT /B

minikerberos/_version.py

@@ -1,5 +1,5 @@
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 __banner__ = \
 """
 # minikerberos %s 

pyproject.toml

@@ -1,3 +1,3 @@
 [build-system]
-requires = ["setuptools"]
+requires = ["setuptools>=61.0.0"]
 build-backend = "setuptools.build_meta"

setup.py

@@ -22,7 +22,7 @@
 	author_email="info@skelsec.com",
 
 	# Packages
-	packages=find_packages(),
+	packages=find_packages(exclude=["tests*"]),
 
 	# Include additional files into the package
 	include_package_data=True,
@@ -46,8 +46,8 @@
 	install_requires=[
 		'asn1crypto>=1.3.0',
 		'oscrypto>=1.2.1',
-		'asysocks>=0.2.2',
-		'unicrypto>=0.0.10',
+		'asysocks==0.2.7',
+		'unicrypto==0.0.10',
 		'tqdm',
         'six',
 	],