KDE neon and ESP32 Bluetooth Classic Sniffer

ainfosec · Sep 8, 2022 · 46239a8 · 46239a8
1 parent af120cc
commit 46239a8
Show file tree

Hide file tree

Showing 8 changed files with 196 additions and 113 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 2022-09-07
+
+The new KDE neon install follows the same steps as Ubuntu 20.04.4. The GUIs look a little wonky due to the differences in Qt.
+
+### Added
+
+- Added KDE Neon (User - 5.25/20.04) option to the installer for the Python3 branch. Will be the same steps as 20.04.4 until a difference is found.
+
+### Fixed
+
+- Modified ESP32 Bluetooth Classic Sniffer installation to work with Wireshark 3.6.5.
+
 ## 2022-09-05
 
 Ubuntu 22.04 is still not fully supported. The 3.10 flow graphs need to be integrated and tested. There are also a few issues remaining with the install.

diff --git a/Help/Markdown/SoftwareAndConflicts.md b/Help/Markdown/SoftwareAndConflicts.md
@@ -14,7 +14,7 @@ The following is a table of the major software tools that have been proven to wo
 | CyberChef | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Dump1090 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Enscribe | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| ESP32 Bluetooth Classic Sniffer | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :question: | :question: | :question: |
+| ESP32 Bluetooth Classic Sniffer | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | ESP8266 Deauther v2 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | FALCON | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :question: |
 | fl2k | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
@@ -118,6 +118,7 @@ The following are the software versions that are included with the FISSURE insta
 4. [Ubuntu 20.04.1](#ubuntu_20_04_1)
 5. [Ubuntu 20.04.4](#ubuntu_20_04_4)
 6. [Ubuntu 22.04](#ubuntu_22_04)
+7. [KDE neon 5.25](#ubuntu_20_04_4)
 
 
 <div id="ubuntu_18_04"/> 
@@ -464,7 +465,7 @@ The following are the software versions that are included with the FISSURE insta
 | CyberChef | - | Yes | https://gchq.github.io/CyberChef/ |
 | Dump1090 | 1.010.3010.14 | Yes | https://github.com/antirez/dump1090 | 
 | Enscribe | 0.1.0 | No | Jason Downer | 
-| ~~ESP32 Bluetooth Classic Sniffer~~ | master | Yes | https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer |
+| ESP32 Bluetooth Classic Sniffer | master | Yes | https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer |
 | ESP8266 Deauther v2 | v2 | Yes | https://github.com/SpacehuhnTech/esp8266_deauther |
 | FALCON | - | Yes | https://github.com/falkenber9/falcon | 
 | fl2k | - | Yes | https://osmocom.org/projects/osmo-fl2k/wiki |
@@ -574,7 +575,7 @@ The following are the software versions that are included with the FISSURE insta
 | CyberChef | - | Yes | https://gchq.github.io/CyberChef/ |
 | Dump1090 | 1.010.3010.14 | Yes | https://github.com/antirez/dump1090 | 
 | Enscribe | 0.1.0 | No | Jason Downer | 
-| ~~ESP32 Bluetooth Classic Sniffer~~ | master | Yes | https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer |
+| ESP32 Bluetooth Classic Sniffer | master | Yes | https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer |
 | ESP8266 Deauther v2 | v2 | Yes | https://github.com/SpacehuhnTech/esp8266_deauther |
 | FALCON | - | Yes | https://github.com/falkenber9/falcon | 
 | fl2k | - | Yes | https://osmocom.org/projects/osmo-fl2k/wiki |
@@ -684,7 +685,7 @@ The following are the software versions that are included with the FISSURE insta
 | CyberChef | - | Yes | https://gchq.github.io/CyberChef/ |
 | Dump1090 | 1.010.3010.14 | Yes | https://github.com/antirez/dump1090 | 
 | Enscribe | 0.1.0 | No | Jason Downer | 
-| ~~ESP32 Bluetooth Classic Sniffer~~ | master | Yes | https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer |
+| ESP32 Bluetooth Classic Sniffer | master | Yes | https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer |
 | ESP8266 Deauther v2 | v2 | Yes | https://github.com/SpacehuhnTech/esp8266_deauther |
 | ~~FALCON~~ | - | Yes | https://github.com/falkenber9/falcon | 
 | fl2k | - | Yes | https://osmocom.org/projects/osmo-fl2k/wiki |

diff --git a/Help/SoftwareAndConflicts.html b/Help/SoftwareAndConflicts.html
@@ -215,9 +215,9 @@ <h1><a id="user-content-third-party-software" class="anchor" aria-hidden="true"
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
 <td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
-<td align="center"><g-emoji class="g-emoji" alias="question" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2753.png">❓</g-emoji></td>
-<td align="center"><g-emoji class="g-emoji" alias="question" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2753.png">❓</g-emoji></td>
-<td align="center"><g-emoji class="g-emoji" alias="question" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2753.png">❓</g-emoji></td>
+<td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
+<td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
+<td align="center"><g-emoji class="g-emoji" alias="heavy_check_mark" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/2714.png">✔️</g-emoji></td>
 </tr>
 <tr>
 <td>ESP8266 Deauther v2</td>
@@ -1058,6 +1058,7 @@ <h2><a id="user-content-third-party-software-versions" class="anchor" aria-hidde
 <li><a href="#ubuntu_20_04_1">Ubuntu 20.04.1</a></li>
 <li><a href="#ubuntu_20_04_4">Ubuntu 20.04.4</a></li>
 <li><a href="#ubuntu_22_04">Ubuntu 22.04</a></li>
+<li><a href="#ubuntu_20_04_4">KDE neon 5.25</a></li>
 </ol>
 <div id="user-content-ubuntu_18_04"></div> 
 <h3><a id="user-content-ubuntu-1804" class="anchor" aria-hidden="true" href="#ubuntu-1804"><span aria-hidden="true" class="octicon octicon-link"></span></a>Ubuntu 18.04</h3>
@@ -3016,7 +3017,7 @@ <h3><a id="user-content-ubuntu-20041" class="anchor" aria-hidden="true" href="#u
 <td>Jason Downer</td>
 </tr>
 <tr>
-<td><del>ESP32 Bluetooth Classic Sniffer</del></td>
+<td>ESP32 Bluetooth Classic Sniffer</td>
 <td>master</td>
 <td align="center">Yes</td>
 <td><a href="https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer">https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer</a></td>
@@ -3649,7 +3650,7 @@ <h3><a id="user-content-ubuntu-20044" class="anchor" aria-hidden="true" href="#u
 <td>Jason Downer</td>
 </tr>
 <tr>
-<td><del>ESP32 Bluetooth Classic Sniffer</del></td>
+<td>ESP32 Bluetooth Classic Sniffer</td>
 <td>master</td>
 <td align="center">Yes</td>
 <td><a href="https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer">https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer</a></td>
@@ -4282,7 +4283,7 @@ <h3><a id="user-content-ubuntu-2204" class="anchor" aria-hidden="true" href="#ub
 <td>Jason Downer</td>
 </tr>
 <tr>
-<td><del>ESP32 Bluetooth Classic Sniffer</del></td>
+<td>ESP32 Bluetooth Classic Sniffer</td>
 <td>master</td>
 <td align="center">Yes</td>
 <td><a href="https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer">https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer</a></td>

diff --git a/Installer/installer b/Installer/installer
@@ -1529,17 +1529,23 @@ programs_ubuntu20_04.append(('Enscribe',
 ls /usr/bin/enscribe
 """,True,None))
 
-# ESP32 Bluetooth Classic Sniffer - Fix (needs specific Wireshark version)
+# ESP32 Bluetooth Classic Sniffer
 programs_ubuntu20_04.append(('ESP32 BT Classic Sniffer',
-"""mkdir -p ~/Installed_by_FISSURE  # Requires Wireshark 3.4, cannot get it to work with other versions
-cd ~/Installed_by_FISSURE
-#git clone https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer
-#cd esp32_bluetooth_classic_sniffer
-#sudo ./requirements.sh
-#./build.sh
-##sudo cp dissectors/h4bcm.so /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.4/epan/  # Needs to go where "sudo Wireshark" dissectors are located, check Wireshark version for 3.4
-#rm ~/.local/lib/wireshark/plugins/3.4/epan/h4bcm.so  # To avoid "plugin 'h4bcm.so' was found in multiple directories" warning
-""",False,None))
+"""mkdir -p ~/Installed_by_FISSURE  # Requires Wireshark 3.4 by default, modifying it for 3.6.5
+cd ~/Installed_by_FISSURE
+git clone https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer
+cd esp32_bluetooth_classic_sniffer
+rm ./dissectors/config.h
+sed -i 's/Bluetooth Link Manager Protocol/ESP32 Bluetooth Link Manager Protocol/g' ./dissectors/packet-btbrlmp.c
+sed -i 's/btlmp/esp32_btlmp/g' ./dissectors/packet-btbrlmp.c
+sed -i 's/3.4/3.6/g' ./dissectors/build.sh
+sudo ./requirements.sh
+./build.sh
+sudo cp dissectors/h4bcm.so /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.6/epan/  # Placing it where "sudo Wireshark" dissectors are located
+rm ~/.local/lib/wireshark/plugins/3.6/epan/h4bcm.so  # To avoid "plugin 'h4bcm.so' was found in multiple directories" warning
+########## Verify ##########
+ls /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.6/epan/h4bcm.so
+""",True,None))
 
 
 
@@ -3054,17 +3060,23 @@ programs_ubuntu20_04_4.append(('Enscribe',
 ls /usr/bin/enscribe
 """,True,None))
 
-# ESP32 Bluetooth Classic Sniffer - Fix (needs specific Wireshark version)
+# ESP32 Bluetooth Classic Sniffer
 programs_ubuntu20_04_4.append(('ESP32 BT Classic Sniffer',
-"""mkdir -p ~/Installed_by_FISSURE  # Requires Wireshark 3.4, cannot get it to work with other versions
-cd ~/Installed_by_FISSURE
-#git clone https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer
-#cd esp32_bluetooth_classic_sniffer
-#sudo ./requirements.sh
-#./build.sh
-##sudo cp dissectors/h4bcm.so /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.4/epan/  # Needs to go where "sudo Wireshark" dissectors are located, check Wireshark version for 3.4
-#rm ~/.local/lib/wireshark/plugins/3.4/epan/h4bcm.so  # To avoid "plugin 'h4bcm.so' was found in multiple directories" warning
-""",False,None))
+"""mkdir -p ~/Installed_by_FISSURE  # Requires Wireshark 3.4 by default, modifying it for 3.6.5
+cd ~/Installed_by_FISSURE
+git clone https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer
+cd esp32_bluetooth_classic_sniffer
+rm ./dissectors/config.h
+sed -i 's/Bluetooth Link Manager Protocol/ESP32 Bluetooth Link Manager Protocol/g' ./dissectors/packet-btbrlmp.c
+sed -i 's/btlmp/esp32_btlmp/g' ./dissectors/packet-btbrlmp.c
+sed -i 's/3.4/3.6/g' ./dissectors/build.sh
+sudo ./requirements.sh
+./build.sh
+sudo cp dissectors/h4bcm.so /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.6/epan/  # Placing it where "sudo Wireshark" dissectors are located
+rm ~/.local/lib/wireshark/plugins/3.6/epan/h4bcm.so  # To avoid "plugin 'h4bcm.so' was found in multiple directories" warning
+########## Verify ##########
+ls /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.6/epan/h4bcm.so
+""",True,None))
 
 
 ########################################################################
@@ -4480,17 +4492,23 @@ programs_ubuntu22_04.append(('Enscribe',
 ls /usr/bin/enscribe
 """,True,None))
 
-# ESP32 Bluetooth Classic Sniffer - Fix (needs specific Wireshark version)
+# ESP32 Bluetooth Classic Sniffer
 programs_ubuntu22_04.append(('ESP32 BT Classic Sniffer',
-"""mkdir -p ~/Installed_by_FISSURE  # Requires Wireshark 3.4, cannot get it to work with other versions
-cd ~/Installed_by_FISSURE
-#git clone https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer
-#cd esp32_bluetooth_classic_sniffer
-#sudo ./requirements.sh
-#./build.sh
-##sudo cp dissectors/h4bcm.so /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.4/epan/  # Needs to go where "sudo Wireshark" dissectors are located, check Wireshark version for 3.4
-#rm ~/.local/lib/wireshark/plugins/3.4/epan/h4bcm.so  # To avoid "plugin 'h4bcm.so' was found in multiple directories" warning
-""",False,None))
+"""mkdir -p ~/Installed_by_FISSURE  # Requires Wireshark 3.4 by default, modifying it for 3.6.5
+cd ~/Installed_by_FISSURE
+git clone https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer
+cd esp32_bluetooth_classic_sniffer
+rm ./dissectors/config.h
+sed -i 's/Bluetooth Link Manager Protocol/ESP32 Bluetooth Link Manager Protocol/g' ./dissectors/packet-btbrlmp.c
+sed -i 's/btlmp/esp32_btlmp/g' ./dissectors/packet-btbrlmp.c
+sed -i 's/3.4/3.6/g' ./dissectors/build.sh
+sudo ./requirements.sh
+./build.sh
+sudo cp dissectors/h4bcm.so /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.6/epan/  # Placing it where "sudo Wireshark" dissectors are located
+rm ~/.local/lib/wireshark/plugins/3.6/epan/h4bcm.so  # To avoid "plugin 'h4bcm.so' was found in multiple directories" warning
+########## Verify ##########
+ls /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.6/epan/h4bcm.so
+""",True,None))
 
 
 
@@ -6000,17 +6018,23 @@ btscanner --help
 # ls /usr/bin/enscribe
 # """,True,None))
 
-# # ESP32 Bluetooth Classic Sniffer - Fix (needs specific Wireshark version)
+# # ESP32 Bluetooth Classic Sniffer
 # programs_dragonOS_focal.append(('ESP32 BT Classic Sniffer',
-# """mkdir -p ~/Installed_by_FISSURE  # Requires Wireshark 3.4, cannot get it to work with other versions
+# """mkdir -p ~/Installed_by_FISSURE  # Requires Wireshark 3.4 by default, modifying it for 3.6.5
 # cd ~/Installed_by_FISSURE
-# #git clone https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer
-# #cd esp32_bluetooth_classic_sniffer
-# #sudo ./requirements.sh
-# #./build.sh
-# ##sudo cp dissectors/h4bcm.so /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.4/epan/  # Needs to go where "sudo Wireshark" dissectors are located, check Wireshark version for 3.4
-# #rm ~/.local/lib/wireshark/plugins/3.4/epan/h4bcm.so  # To avoid "plugin 'h4bcm.so' was found in multiple directories" warning
-# """,False,None))
+# git clone https://github.com/Matheus-Garbelini/esp32_bluetooth_classic_sniffer
+# cd esp32_bluetooth_classic_sniffer
+# rm ./dissectors/config.h
+# sed -i 's/Bluetooth Link Manager Protocol/ESP32 Bluetooth Link Manager Protocol/g' ./dissectors/packet-btbrlmp.c
+# sed -i 's/btlmp/esp32_btlmp/g' ./dissectors/packet-btbrlmp.c
+# sed -i 's/3.4/3.6/g' ./dissectors/build.sh
+# sudo ./requirements.sh
+# ./build.sh
+# sudo cp dissectors/h4bcm.so /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.6/epan/  # Placing it where "sudo Wireshark" dissectors are located
+# rm ~/.local/lib/wireshark/plugins/3.6/epan/h4bcm.so  # To avoid "plugin 'h4bcm.so' was found in multiple directories" warning
+# ########## Verify ##########
+# ls /usr/lib/x86_64-linux-gnu/wireshark/plugins/3.6/epan/h4bcm.so
+# """,True,None))
 
 
 ########################################################################
@@ -6265,6 +6289,9 @@ class InstallDialog1(QtWidgets.QDialog, form_class):
             self.radioButton_ubuntu22_04.setChecked(True)
         elif "DragonOS Focal" in stdout:
             self.radioButton_dragonOS_focal.setChecked(True)
+        elif "KDE neon" in stdout:
+            if "5.25" in stdout:
+                self.radioButton_kde_neon_5_25.setChecked(True)
 
         self.get_os = ""
 
@@ -6287,6 +6314,8 @@ class InstallDialog1(QtWidgets.QDialog, form_class):
             self.get_os = "Ubuntu 22.04"
         elif self.radioButton_dragonOS_focal.isChecked():
             self.get_os = "DragonOS Focal"
+        elif self.radioButton_kde_neon_5_25.isChecked():
+            self.get_os = "KDE neon 5.25"
 
         self.accept()
 
@@ -6315,6 +6344,8 @@ def main(argv):
             install_dlg2 = InstallDialog2(programs_ubuntu22_04)
         elif install_dlg1.get_os == "DragonOS Focal":
             install_dlg2 = InstallDialog2(programs_dragonOS_focal)
+        elif install_dlg1.get_os == "KDE neon 5.25":
+            install_dlg2 = InstallDialog2(programs_ubuntu20_04_4)
         install_dlg2.show() 
 
         # Install Clicked