requirements: use own fork of python-ntlm

client/requirements.txt

@@ -11,4 +11,4 @@ win_inet_pton
 dnslib
 dukpy
 zeroconf==0.19.1
-python-ntlm
+https://github.com/alxchk/python-ntlm/archive/master.zip

client/sources-linux/build-docker.sh

@@ -1,12 +1,12 @@
 #!/bin/sh
 
-SELF=`readlink -f "$0"`
+SELF=$(readlink -f "$0")
-SELFPWD=`dirname "$SELF"`
+SELFPWD=$(dirname "$SELF")
-SRC=${SELFPWD:-`pwd`}
+SRC=${SELFPWD:-$(pwd)}
 
 cd $SRC
 
-PUPY=`readlink -f ../../pupy/`
+PUPY=$(readlink -f ../../pupy/)
 TEMPLATES=$PUPY/payload_templates
 
 EXTERNAL=../../pupy/external
@@ -32,11 +32,12 @@ export PRCTL_SKIP_KERNEL_CHECK=yes
 python -m pip install --upgrade \
     rpyc==3.4.4 pyaml rsa netaddr pyyaml ecdsa idna \
     paramiko pylzma pydbus python-ptrace psutil scandir \
-       scapy colorama pyOpenSSL python-xlib msgpack-python python-ntlm \
+    scapy colorama pyOpenSSL python-xlib msgpack-python \
     u-msgpack-python poster dnslib pyxattr pylibacl python-prctl http_parser \
     https://github.com/alxchk/tinyec/archive/master.zip \
     https://github.com/CoreSecurity/impacket/archive/master.zip \
     https://github.com/warner/python-ed25519/archive/master.zip \
+    https://github.com/alxchk/python-ntlm/archive/master.zip \
     zeroconf==0.19.1 \
     watchdog pulsectl pyalsaaudio pycryptodomex==3.7.0 --no-binary :all:
 
@@ -65,7 +66,7 @@ python -m pip install --upgrade --force $PYKCP
 python -c 'import kcp' || exit 1
 
 echo "[+] Compile opus"
-( cd $PYOPUS && make clean && make && mv -f opus.so /usr/lib/python2.7/site-packages )
+(cd $PYOPUS && make clean && make && mv -f opus.so /usr/lib/python2.7/site-packages)
 python -c 'import opus' || exit 1
 
 echo "[+] Compile pyuv"
@@ -104,13 +105,13 @@ ldconfig
 echo "[+] Build pupy"
 
 case $TOOLCHAIN_ARCH in
-    amd64)
+amd64)
     MAKEFLAGS="ARCH=64"
     TARGETS="pupyx64d.lin pupyx64d.lin"
     TARGETS="$TARGETS pupyx64.lin pupyx64.lin.so"
     ;;
 
-    x86)
+x86)
     MAKEFLAGS="ARCH=32 PIE="
     TARGETS="pupyx86d.lin pupyx86d.lin.so"
     TARGTS="$TARGETS pupyx86dpupyx86.lin pupyx86.lin.so"

client/sources/build-docker.sh

@@ -9,17 +9,18 @@ PACKAGES="$PACKAGES pyaudio https://github.com/secdev/scapy/archive/master.zip c
 PACKAGES="$PACKAGES https://github.com/alxchk/pypykatz/archive/master.zip"
 PACKAGES="$PACKAGES https://github.com/warner/python-ed25519/archive/master.zip"
 PACKAGES="$PACKAGES https://github.com/alxchk/tinyec/archive/master.zip"
-PACKAGES="$PACKAGES adodbapi idna wmi winkerberos http_parser python-ntlm"
+PACKAGES="$PACKAGES https://github.com/alxchk/python-ntlm/archive/master.zip"
+PACKAGES="$PACKAGES adodbapi idna wmi winkerberos http_parser"
 
-SELF=`readlink -f "$0"`
+SELF=$(readlink -f "$0")
-SELFPWD=`dirname "$SELF"`
+SELFPWD=$(dirname "$SELF")
-SRC=${SELFPWD:-`pwd`}
+SRC=${SELFPWD:-$(pwd)}
-PUPY=`readlink -f ../../pupy`
+PUPY=$(readlink -f ../../pupy)
 
 cd $SRC
 
-EXTERNAL=`readlink -f ../../pupy/external`
+EXTERNAL=$(readlink -f ../../pupy/external)
-TEMPLATES=`readlink -f ../../pupy/payload_templates`
+TEMPLATES=$(readlink -f ../../pupy/payload_templates)
 WINPTY=$EXTERNAL/winpty
 PYKCP=$EXTERNAL/pykcp
 PYOPUS=$EXTERNAL/pyopus/src
@@ -72,7 +73,6 @@ git clean -fdx
 make -f Makefile.msvc CL=$CL64
 mv -f opus.pyd ${WINE64}/drive_c/Python27/Lib/site-packages/
 
-
 echo "[+] Compile winpty /32"
 rm -f $WINPTY/build/winpty.dll
 make -C ${WINPTY} clean
@@ -99,14 +99,14 @@ echo "[+] Build templates /32"
 cd $WINE32/drive_c/Python27
 rm -f ${TEMPLATES}/windows-x86.zip
 for dir in Lib DLLs; do
-cd $dir
+    cd $dir
-zip -q -y \
+    zip -q -y \
         -x "*.a" -x "*.o" -x "*.whl" -x "*.txt" -x "*.pyo" -x "*.pyc" -x "*.chm" \
         -x "*test/*" -x "*tests/*" -x "*examples/*" -x "pythonwin/*" \
         -x "idlelib/*" -x "lib-tk/*" -x "tk*" -x "tcl*" \
         -x "*.egg-info/*" -x "*.dist-info/*" -x "*.exe" \
         -r9 ${TEMPLATES}/windows-x86.zip .
-cd -
+    cd -
 done
 
 cd $WINE64/drive_c/Python27
@@ -114,14 +114,14 @@ rm -f ${TEMPLATES}/windows-amd64.zip
 
 echo "[+] Build templates /64"
 for dir in Lib DLLs; do
-cd $dir
+    cd $dir
-zip -q -y \
+    zip -q -y \
         -x "*.a" -x "*.o" -x "*.whl" -x "*.txt" -x "*.pyo" -x "*.pyc" -x "*.chm" \
         -x "*test/*" -x "*tests/*" -x "*examples/*" -x "pythonwin/*" \
         -x "idlelib/*" -x "lib-tk/*" -x "tk*" -x "tcl*" \
         -x "*.egg-info/*" -x "*.dist-info/*" -x "*.exe" \
         -r9 ${TEMPLATES}/windows-amd64.zip .
-cd -
+    cd -
 done
 
 echo "[+] Build pupy"

pupy/requirements.txt

@@ -43,7 +43,7 @@ xattr
 dukpy
 pyaes
 chardet
-python-ntlm
+https://github.com/alxchk/python-ntlm/archive/master.zip
 http_request
 -e external/pykcp
 flake8