Just Call Me Koko 5 лет назад
Родитель
Сommit
06c70562a7

+ 9 - 0
README.md

@@ -52,14 +52,23 @@ You can check out the marauder article written [here](https://www.hackster.io/ne
 
 
 ## Capabilities
 ## Capabilities
 ### Current
 ### Current
+- Join WiFi: Just join a WiFi network
+- Shutdown WiFi: Shutdown the Marauder WiFi interface to save some RAM
+- Generate SSIDs: Add 20 random SSIDs to your list of SSIDs
+- Add SSID: Use an on-screen keyboard to add your own SSIDs to the SSID list
+- Clear SSIDs: Clear the list of SSIDs
 - Probe Request Sniff: Sniff for WiFi [probe request frames](https://mrncciew.com/2014/10/27/cwap-802-11-probe-requestresponse/) sent by wireless devices
 - Probe Request Sniff: Sniff for WiFi [probe request frames](https://mrncciew.com/2014/10/27/cwap-802-11-probe-requestresponse/) sent by wireless devices
 - Beacon Sniff: Sniff [beacon frames](https://en.wikipedia.org/wiki/Beacon_frame) sent by wireless acccess points
 - Beacon Sniff: Sniff [beacon frames](https://en.wikipedia.org/wiki/Beacon_frame) sent by wireless acccess points
+- Beacon Spam List: Spam a list of SSIDs and monitoring connection attempts to those networks
 - Beacon Spam Random: Spam hundreds of random beacon frames to wireless devices within range
 - Beacon Spam Random: Spam hundreds of random beacon frames to wireless devices within range
 - Rick Roll Beacon: Broadcast the rick roll lyrics as WiFi access points
 - Rick Roll Beacon: Broadcast the rick roll lyrics as WiFi access points
 - Bluetooth Sniffer: Sniff bluetooth devices within range
 - Bluetooth Sniffer: Sniff bluetooth devices within range
+- Shutdown BLE: Shutdown the Marauder BLE interface to save RAM
 - Detect Card Skimmers: Detect bluetooth enabled credit card skimmers
 - Detect Card Skimmers: Detect bluetooth enabled credit card skimmers
 - Packet Monitor: Show WiFi packet density on a given channel using a time bar graph
 - Packet Monitor: Show WiFi packet density on a given channel using a time bar graph
 - EAPOL/PMKID Scan: Capture EAPOL/PMKID frames
 - EAPOL/PMKID Scan: Capture EAPOL/PMKID frames
+- Detect Pwnagotchi: Detect any pwnagotchis in range
+- Detect Espressif: Detect any espressif devices in range
 - Deauth Sniff: Detect deauthentication packets sent on all channels
 - Deauth Sniff: Detect deauthentication packets sent on all channels
 - Draw: Just doodle on the screen or whatever
 - Draw: Just doodle on the screen or whatever
 - Update Firmware: Update Marauder firmware over the air via web interface or with SD card
 - Update Firmware: Update Marauder firmware over the air via web interface or with SD card

+ 3 - 3
esp32_marauder/Display.h

@@ -36,8 +36,8 @@
 #define LV_ADD_SSID 14
 #define LV_ADD_SSID 14
 #define WIFI_ATTACK_BEACON_LIST 15
 #define WIFI_ATTACK_BEACON_LIST 15
 
 
-//#define TFT_SHIELD
-#define TFT_DIY
+#define TFT_SHIELD
+//#define TFT_DIY
 
 
 #define SCREEN_WIDTH 240
 #define SCREEN_WIDTH 240
 #define SCREEN_HEIGHT 320
 #define SCREEN_HEIGHT 320
@@ -98,7 +98,7 @@ class Display
     TFT_eSPI tft = TFT_eSPI();
     TFT_eSPI tft = TFT_eSPI();
     TFT_eSprite img = TFT_eSprite(&tft);
     TFT_eSprite img = TFT_eSprite(&tft);
     TFT_eSPI_Button key[BUTTON_ARRAY_LEN];
     TFT_eSPI_Button key[BUTTON_ARRAY_LEN];
-    const String PROGMEM version_number = "v0.7.1";
+    const String PROGMEM version_number = "v0.8.0";
 
 
     bool printing = false;
     bool printing = false;
     bool loading = false;
     bool loading = false;

+ 0 - 0
esp32_marauder/esp32_marauder_v0_7_0_20200719_6.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_7_0_20200719_6.bin


+ 0 - 0
esp32_marauder/esp32_marauder_v0_7_0_20200819_1.bin → esp32_marauder/PreviousVersions/esp32_marauder_v0_7_0_20200819_1.bin


+ 2 - 0
esp32_marauder/WiFiScan.cpp

@@ -378,6 +378,7 @@ String WiFiScan::getStaMAC()
   esp_wifi_set_mode(WIFI_MODE_NULL);
   esp_wifi_set_mode(WIFI_MODE_NULL);
   esp_wifi_start();
   esp_wifi_start();
   esp_err_t mac_status = esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
   esp_err_t mac_status = esp_wifi_get_mac(ESP_IF_WIFI_STA, mac);
+  this->wifi_initialized = true;
   sprintf(macAddrChr, 
   sprintf(macAddrChr, 
           "%02X:%02X:%02X:%02X:%02X:%02X",
           "%02X:%02X:%02X:%02X:%02X:%02X",
           mac[0],
           mac[0],
@@ -401,6 +402,7 @@ String WiFiScan::getApMAC()
   esp_wifi_set_mode(WIFI_MODE_NULL);
   esp_wifi_set_mode(WIFI_MODE_NULL);
   esp_wifi_start();
   esp_wifi_start();
   esp_err_t mac_status = esp_wifi_get_mac(ESP_IF_WIFI_AP, mac);
   esp_err_t mac_status = esp_wifi_get_mac(ESP_IF_WIFI_AP, mac);
+  this->wifi_initialized = true;
   sprintf(macAddrChr, 
   sprintf(macAddrChr, 
           "%02X:%02X:%02X:%02X:%02X:%02X",
           "%02X:%02X:%02X:%02X:%02X:%02X",
           mac[0],
           mac[0],

BIN
esp32_marauder/esp32_marauder_v0_8_0_20200831_new_hardware.bin


BIN
esp32_marauder/esp32_marauder_v0_8_0_20200831_old_hardware.bin