From a4483c0901cc934f4183a046e86806d1a3743767 Mon Sep 17 00:00:00 2001 From: Cx01N Date: Wed, 22 Apr 2020 17:01:10 -0400 Subject: [PATCH 1/4] updated setup_database to run as python3 during install --- setup/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/install.sh b/setup/install.sh index 1cc1bdaa8..6fdb1d1c7 100755 --- a/setup/install.sh +++ b/setup/install.sh @@ -159,7 +159,7 @@ if ls /usr/bin/ | grep -q "python2"; then fi # set up the database schema -python ./setup_database.py +python3 ./setup_database.py # generate a cert ./cert.sh From a14bf0c37f7d59eebef70026822b614ee1295c96 Mon Sep 17 00:00:00 2001 From: Cx01N Date: Wed, 22 Apr 2020 19:30:03 -0400 Subject: [PATCH 2/4] fixed python3 call to setup_database in reset script --- setup/reset.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/reset.sh b/setup/reset.sh index 6d3818704..5e291d84c 100755 --- a/setup/reset.sh +++ b/setup/reset.sh @@ -18,7 +18,7 @@ then rm ../data/empire.db fi -python ./setup_database.py +python3 ./setup_database.py cd .. # remove the debug file if it exists From 8a40e6728ef30991867e1d8044ad80c79a43b8ce Mon Sep 17 00:00:00 2001 From: Cx01N Date: Wed, 22 Apr 2020 19:49:23 -0400 Subject: [PATCH 3/4] updated install script --- setup/install.sh | 9 +++------ setup/requirements.txt | 3 +-- setup/requirements_libssl1.0.txt | 3 ++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/setup/install.sh b/setup/install.sh index 6fdb1d1c7..c65a92a9c 100755 --- a/setup/install.sh +++ b/setup/install.sh @@ -120,7 +120,7 @@ Pip_file="requirements.txt" if lsb_release -d | grep -q "Kali"; then apt-get update - sudo apt-get install -y make autoconf g++ python-dev python-m2crypto swig python-pip libxml2-dev default-jdk zlib1g-dev libssl1.1 build-essential libssl-dev libxml2-dev zlib1g-dev + sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip libxml2-dev default-jdk zlib1g-dev libssl1.1 build-essential libssl-dev libxml2-dev zlib1g-dev elif lsb_release -d | grep -q "Ubuntu"; then if is_libssl_1_0; then LibSSL_pkgs="libssl1.0.0 libssl-dev" @@ -129,7 +129,7 @@ elif lsb_release -d | grep -q "Ubuntu"; then LibSSL_pkgs="libssl1.1 libssl-dev" fi sudo apt-get update - sudo apt-get install -y make autoconf g++ python-dev python-m2crypto swig python-pip libxml2-dev default-jdk $LibSSL_pkgs build-essential + sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip libxml2-dev default-jdk $LibSSL_pkgs build-essential else echo "Unknown distro - Debian/Ubuntu Fallback" if is_libssl_1_0; then @@ -139,7 +139,7 @@ else LibSSL_pkgs="libssl1.1 libssl-dev" fi sudo apt-get update - sudo apt-get install -y make autoconf g++ python-dev python-m2crypto swig python-pip libxml2-dev default-jdk libffi-dev $LibSSL_pkgs build-essential + sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip libxml2-dev default-jdk libffi-dev $LibSSL_pkgs build-essential fi install_xar @@ -154,9 +154,6 @@ if ls /usr/bin/ | grep -q "python3"; then fi sudo pip3 install -r $Pip_file fi -if ls /usr/bin/ | grep -q "python2"; then - sudo pip install -r $Pip_file -fi # set up the database schema python3 ./setup_database.py diff --git a/setup/requirements.txt b/setup/requirements.txt index 55e34db81..d680cd875 100644 --- a/setup/requirements.txt +++ b/setup/requirements.txt @@ -10,7 +10,6 @@ pyOpenSSL pyinstaller zlib_wrapper netifaces -M2Crypto jinja2 cryptography pyminifier @@ -18,4 +17,4 @@ xlutils pefile simplejson bcrypt -pycrypto +pycrypto \ No newline at end of file diff --git a/setup/requirements_libssl1.0.txt b/setup/requirements_libssl1.0.txt index 6db62ca7c..05cdac2b3 100644 --- a/setup/requirements_libssl1.0.txt +++ b/setup/requirements_libssl1.0.txt @@ -10,10 +10,11 @@ pyOpenSSL==17.2.0 pyinstaller zlib_wrapper netifaces -M2Crypto jinja2 cryptography pyminifier==2.1 xlutils pefile pycrypto +bcrypt +simplejson From 95d4e035a20752f523a8554a65dc77c71987c099 Mon Sep 17 00:00:00 2001 From: Cx01N Date: Wed, 22 Apr 2020 22:42:51 -0400 Subject: [PATCH 4/4] readded python3-m2crypto to apt install --- setup/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/install.sh b/setup/install.sh index c65a92a9c..4d062d174 100755 --- a/setup/install.sh +++ b/setup/install.sh @@ -120,7 +120,7 @@ Pip_file="requirements.txt" if lsb_release -d | grep -q "Kali"; then apt-get update - sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip libxml2-dev default-jdk zlib1g-dev libssl1.1 build-essential libssl-dev libxml2-dev zlib1g-dev + sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip python3-m2crypto libxml2-dev default-jdk zlib1g-dev libssl1.1 build-essential libssl-dev libxml2-dev zlib1g-dev elif lsb_release -d | grep -q "Ubuntu"; then if is_libssl_1_0; then LibSSL_pkgs="libssl1.0.0 libssl-dev" @@ -129,7 +129,7 @@ elif lsb_release -d | grep -q "Ubuntu"; then LibSSL_pkgs="libssl1.1 libssl-dev" fi sudo apt-get update - sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip libxml2-dev default-jdk $LibSSL_pkgs build-essential + sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip python3-m2crypto libxml2-dev default-jdk $LibSSL_pkgs build-essential else echo "Unknown distro - Debian/Ubuntu Fallback" if is_libssl_1_0; then @@ -139,7 +139,7 @@ else LibSSL_pkgs="libssl1.1 libssl-dev" fi sudo apt-get update - sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip libxml2-dev default-jdk libffi-dev $LibSSL_pkgs build-essential + sudo apt-get install -y make autoconf g++ python3-dev swig python3-pip python3-m2crypto libxml2-dev default-jdk libffi-dev $LibSSL_pkgs build-essential fi install_xar