更新下载链接、更新软件版本,增强 RSA 相关模块的安装

tugdualnicolas · Sep 22, 2021 · aad745f · aad745f
1 parent 91f173e
commit aad745f
Show file tree

Hide file tree

Showing 2 changed files with 110 additions and 15 deletions.
diff --git a/f8x b/f8x
@@ -25,7 +25,7 @@ Proxy_URL="https://cdn.ffffffff0x.com/?durl=https://codeload.github.com/rofl0r/p
 Porxy_OK=
 Docker_OK=
 error=0
-F8x_Version="1.5.6 Dev(Beta1)"
+F8x_Version="1.5.6 Dev(Beta2)"
 
 # ===================== 软件版本变量设置 =====================
 hashcat_Version="hashcat-6.2.4"
@@ -55,12 +55,13 @@ fscan_Ver="1.6.3"
 fscan_Install="fscan_amd64"
 ffuf_Ver="v1.3.1"
 ffuf_Install="ffuf_1.3.1_linux_amd64.tar.gz"
-Nuclei_Ver="v2.5.1"
-Nuclei_Install="nuclei_2.5.1_linux_amd64.zip"
+Nuclei_Ver="v2.5.2"
+Nuclei_Install="nuclei_2.5.2_linux_amd64.zip"
 rad_File="rad_linux_amd64.zip"
+crawlergo_Ver="v0.4.1"
 crawlergo_File="crawlergo_linux_amd64.zip"
-Terraform_Ver="1.0.6"
-Terraform_bin="terraform_1.0.6_linux_amd64.zip"
+Terraform_Ver="1.0.7"
+Terraform_bin="terraform_1.0.7_linux_amd64.zip"
 CrossC2_Ver="v2.2.5"
 node_Ver="v14.16.0"
 node_bin="node-v14.16.0-linux-x64.tar.xz"
@@ -126,9 +127,9 @@ unfurl_Ver="v0.2.0"
 unfurl_Bin="unfurl-linux-amd64-0.2.0.tgz"
 qsreplace_Ver="v0.0.1"
 qsreplace_bin="qsreplace-linux-amd64-0.0.1.tgz"
-jaeles_Ver="beta-v0.16"
-jaeles_bin="jaeles-v0.16-linux-amd64.zip"
-jaeles_sbin="jaeles-v0.16-linux-amd64"
+jaeles_Ver="beta-v0.17"
+jaeles_bin="jaeles-v0.17-linux.zip"
+jaeles_sbin="jaeles-v0.17-linux"
 subjs_Ver="v1.0.1"
 subjs_bin="subjs_1.0.1_linux_amd64.tar.gz"
 assetfinder_Ver="v0.1.1"
@@ -1901,7 +1902,7 @@ Pentest_crawlergo_Install(){
     then
         Echo_ALERT "$name 已安装"
     else
-        cd /tmp && rm -f $crawlergo_File > /dev/null 2>&1 && $Porxy_OK wget ${GitPorxy}https://github.com/0Kee-Team/crawlergo/releases/latest/download/$crawlergo_File > /dev/null 2>&1 || Echo_ERROR2
+        cd /tmp && rm -f $crawlergo_File > /dev/null 2>&1 && $Porxy_OK wget ${GitPorxy}https://github.com/Qianlitp/crawlergo/releases/download/$crawlergo_Ver/$crawlergo_File > /dev/null 2>&1 || Echo_ERROR2
         unzip $crawlergo_File > /dev/null 2>&1 || Echo_ERROR "解压 /tmp/$crawlergo_File 失败,请查看日志 /tmp/f8x_error.log"
         mv --force crawlergo /usr/local/bin/ && chmod +x /usr/local/bin/crawlergo && rm -f /tmp/$crawlergo_File > /dev/null 2>&1 && Echo_INFOR "已安装 $name 在 /usr/local/bin/ 目录下,直接输入 crawlergo 即可使用" || Echo_ERROR3
 

diff --git a/f8x-ctf b/f8x-ctf
@@ -11,7 +11,7 @@ fi
 
 . /usr/local/bin/f8x
 
-F8x_ctf_Version="0.0.2 Dev"
+F8x_ctf_Version="0.0.3 Dev"
 
 # ===================== 软件版本变量设置 =====================
 
@@ -25,12 +25,17 @@ bkcrack_dir="bkcrack-1.3.1-Linux"
 
 # ===================== CTF MISC 工具 =====================
 
+CTF_Misc_install(){
+
+    Install_Switch "strace"
+
+}
+
 CTF_Misc_py3_module_install(){
 
     Install_Switch4 "base58"
     Install_Switch4 "uncompyle6"
     Install_Switch4 "requests"
-    Install_Switch4 "gmpy2" > /dev/null 2>&1
     Install_Switch4 "zlib" > /dev/null 2>&1
     Install_Switch4 "struct" > /dev/null 2>&1
     Install_Switch4 "libnum"
@@ -302,11 +307,90 @@ CTF_crc32_install(){
 
 }
 
+# ===================== CTF CRYPTO 工具 =====================
+
+CTF_Crypto_install(){
+
+    Install_Switch "python-gmpy2"
+
+    case $Linux_Version in
+        *"CentOS"*|*"RedHat"*|*"Fedora"*)
+            echo "" # 暂时不填
+            ;;
+        *"Kali"*|*"Ubuntu"*|*"Debian"*)
+            Install_Switch "libgmp-dev"
+            Install_Switch "libmpfr-dev"
+            Install_Switch "libmpc-dev"
+            ;;
+        *) ;;
+    esac
+
+}
+
 CTF_Crypto_py3_module_install(){
 
-    name="ciphey"
-    python3 -m pip install --upgrade ciphey > /dev/null 2>&1 && Echo_INFOR "已安装 ciphey" || Echo_ERROR "尝试使用 --ignore-installed 安装"
+    #name="ciphey"
+    #python3 -m pip install --upgrade ciphey > /dev/null 2>&1 && Echo_INFOR "已安装 ciphey" || Echo_ERROR "尝试使用 --ignore-installed 安装"
     Install_Switch4 "xortool"
+    Install_Switch4 "pycrypto"
+    Install_Switch4 "primefac"
+    Install_Switch4 "gmpy"
+    Install_Switch4 "gmpy2"
+    Install_Switch4 "rsa"
+    Install_Switch4 "owiener"
+    Install_Switch4 "factordb-python"
+    Install_Switch4 "sympy"
+
+}
+
+CTF_Crypto_py2_module_install(){
+
+    Install_Switch3 "libnum"
+    Install_Switch3 "owiener"
+
+}
+
+CTF_rsatool_install(){
+
+    name="rsatool"
+    dir="$P_Dir/rsatool"
+
+    if test -d $dir
+    then
+        Echo_ALERT "$name 已安装在 $dir"
+    else
+        cd $P_Dir && $Porxy_OK git clone https://github.com/ius/rsatool.git > /dev/null 2>&1
+        cd rsatool && python3 rsatool.py -h > /dev/null 2>&1 && Echo_INFOR "已安装 $name 在 $dir 目录下" || Echo_ERROR2
+    fi
+
+}
+
+CTF_RsaCtfTool_install(){
+
+    name="RsaCtfTool"
+    dir="$P_Dir/RsaCtfTool"
+
+    if test -d $dir
+    then
+        Echo_ALERT "$name 已安装在 $dir"
+    else
+        case $Linux_Version in
+            *"Fedora"*)
+                Install_Switch "gmp-devel"
+                Install_Switch "mpfr-devel"
+                Install_Switch "libmpc-devel"
+                ;;
+            *"Kali"*|*"Ubuntu"*|*"Debian"*)
+                Install_Switch "libgmp3-dev"
+                ;;
+            *) ;;
+        esac
+
+        cd $P_Dir && $Porxy_OK git clone https://github.com/Ganapati/RsaCtfTool.git > /dev/null 2>&1
+        cd RsaCtfTool
+        pip3 install -r "requirements.txt" > /dev/null 2>&1
+        pip3 install -r "optional-requirements.txt" > /dev/null 2>&1 && Echo_INFOR "已安装 $name 在 $dir 目录下" || Echo_ERROR2
+    fi
 
 }
 
@@ -339,11 +423,13 @@ CTF_firmware-mod-kit_Install(){
 CTF_MISC_tools(){
 
     Rm_Lock
-    echo -e "\033[1;33m\n>> 正在安装 hashcat、7z2hashcat\n\033[0m"
-    Pentest_hashcat_Install
+    echo -e "\033[1;33m\n>> 正在安装一些杂项工具\n\033[0m"
+    CTF_Misc_install
     echo -e "\033[1;33m\n>> 正在安装常见 py 模块\n\033[0m"
     CTF_Misc_py3_module_install
     CTF_Misc_py2_module_install
+    echo -e "\033[1;33m\n>> 正在安装 hashcat、7z2hashcat\n\033[0m"
+    Pentest_hashcat_Install
     echo -e "\033[1;33m\n>> 正在安装 stegoveritas\n\033[0m"
     CTF_stegoveritas_install
     echo -e "\033[1;33m\n>> 正在安装 ImageMagick\n\033[0m"
@@ -383,8 +469,16 @@ CTF_MISC_tools(){
 
 CTF_Crypto_tools(){
 
+    Rm_Lock
+    echo -e "\033[1;33m\n>> 正在安装一些杂项工具\n\033[0m"
+    CTF_Crypto_install
     echo -e "\033[1;33m\n>> 正在安装常见 py 模块\n\033[0m"
     CTF_Crypto_py3_module_install
+    CTF_Crypto_py2_module_install
+    echo -e "\033[1;33m\n>> 正在安装 rsatool\n\033[0m"
+    CTF_rsatool_install
+    echo -e "\033[1;33m\n>> 正在安装 RsaCtfTool\n\033[0m"
+    CTF_RsaCtfTool_install
 
 }