BadUsb, ScanHosts and Deauth

## BadUsb - Added delay between keystrokes to avoid swalling letters ## ScanHosts - Added option to start SSH after scan ## Deauth - Added 1ms delay between packets
pr3y · Jun 2, 2024 · 31f9e60 · 31f9e60
1 parent 54c1648
commit 31f9e60
Show file tree

Hide file tree

Showing 7 changed files with 197 additions and 2 deletions.
diff --git a/lib/Bad_Usb_Lib/KeyboardLayout_pt_PT-BR.cpp b/lib/Bad_Usb_Lib/KeyboardLayout_pt_PT-BR.cpp
@@ -0,0 +1,144 @@
+/*
+ * Portuguese keyboard layout.
+ */
+
+#include "KeyboardLayout.h"
+
+extern const uint8_t KeyboardLayout_pt_BR[128] PROGMEM =
+{
+	0x00,          // NUL
+	0x00,          // SOH
+	0x00,          // STX
+	0x00,          // ETX
+	0x00,          // EOT
+	0x00,          // ENQ
+	0x00,          // ACK
+	0x00,          // BEL
+
+	0x2a,          // BS  Backspace
+	0x2b,          // TAB Tab
+	0x28,          // LF  Enter
+	0x00,          // VT
+	0x00,          // FF
+	0x00,          // CR
+	0x00,          // SO
+	0x00,          // SI
+	0x00,          // DEL
+	0x00,          // DC1
+	0x00,          // DC2
+	0x00,          // DC3
+	0x00,          // DC4
+	0x00,          // NAK
+	0x00,          // SYN
+	0x00,          // ETB
+	0x00,          // CAN
+	0x00,          // EM
+	0x00,          // SUB
+	0x29,          // ESC
+	0x00,          // FS
+	0x00,          // GS
+	0x00,          // RS
+	0x00,          // US
+
+	0x2c,          // ' '
+	0x1e|SHIFT,    // !
+	0x35|SHIFT,    // "
+	0x20|SHIFT,    // #
+	0x21|SHIFT,    // $
+	0x22|SHIFT,    // %
+	0x23|SHIFT,    // &
+	0x35,          // '
+	0x26|SHIFT,    // (
+	0x27|SHIFT,    // )
+	0x25|SHIFT,    // *
+	0x2E|SHIFT,    // +
+	0x36,          // ,
+	0x2D,          // -
+	0x37,          // .
+	0x54,	       // /
+
+	0x27,          // 0
+	0x1e,          // 1
+	0x1f,          // 2
+	0x20,          // 3
+	0x21,          // 4
+	0x22,          // 5
+	0x23,          // 6
+	0x24,          // 7
+	0x25,          // 8
+	0x26,          // 9
+	0x38|SHIFT,    // :
+	0x38,	       // ;
+	0x36|SHIFT,     // <
+	0x2e,          // =
+	0x37|SHIFT,    // >
+	0x54|SHIFT,    // ? ???
+	0x1f|SHIFT,    // @
+
+	0x04|SHIFT,    // A
+	0x05|SHIFT,    // B
+	0x06|SHIFT,    // C
+	0x07|SHIFT,    // D
+	0x08|SHIFT,    // E
+	0x09|SHIFT,    // F
+	0x0a|SHIFT,    // G
+	0x0b|SHIFT,    // H
+	0x0c|SHIFT,    // I
+	0x0d|SHIFT,    // J
+	0x0e|SHIFT,    // K
+	0x0f|SHIFT,    // L
+	0x10|SHIFT,    // M
+	0x11|SHIFT,    // N
+	0x12|SHIFT,    // O
+	0x13|SHIFT,    // P
+	0x14|SHIFT,    // Q
+	0x15|SHIFT,    // R
+	0x16|SHIFT,    // S
+	0x17|SHIFT,    // T
+	0x18|SHIFT,    // U
+	0x19|SHIFT,    // V
+	0x1a|SHIFT,    // W
+	0x1b|SHIFT,    // X
+	0x1c|SHIFT,    // Y
+	0x1d|SHIFT,    // Z
+
+	0x30,          // [
+	0x64,          // bslash
+	0x31,  	       // ]
+	0x34|SHIFT,    // ^  not supported (requires dead key + space)
+	0x2d|SHIFT,    // _
+	0x2f|SHIFT,    // `  not supported (requires dead key + space)
+
+	0x04,          // a
+	0x05,          // b
+	0x06,          // c
+	0x07,          // d
+	0x08,          // e
+	0x09,          // f
+	0x0a,          // g
+	0x0b,          // h
+	0x0c,          // i
+	0x0d,          // j
+	0x0e,          // k
+	0x0f,          // l
+	0x10,          // m
+	0x11,          // n
+	0x12,          // o
+	0x13,          // p
+	0x14,          // q
+	0x15,          // r
+	0x16,          // s
+	0x17,          // t
+	0x18,          // u
+	0x19,          // v
+	0x1a,          // w
+	0x1b,          // x
+	0x1c,          // y
+	0x1d,          // z
+
+	0x30|SHIFT,   // {
+	0x64|SHIFT,    // |
+	0x31|SHIFT,   // }
+	0x34,          // ~  not supported (requires dead key + space)
+	0x00           // DEL
+};
diff --git a/lib/Bad_Usb_Lib/Keyboard_pt_PT-BR.h b/lib/Bad_Usb_Lib/Keyboard_pt_PT-BR.h
@@ -0,0 +1,44 @@
+/*
+  Keyboard_pt_PT.h
+
+  Copyright (c) 2022, Edgar Bonet
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef KEYBOARD_PT_PT_h
+#define KEYBOARD_PT_PT_h
+
+#include "HID.h"
+
+#if !defined(_USING_HID)
+
+#warning "Using legacy HID core (non pluggable)"
+
+#else
+
+//================================================================================
+//================================================================================
+//  Keyboard
+
+// pt_PT keys
+#define KEY_LEFT_GUILLEMET       (136+0x2e)
+#define KEY_ACUTE                (136+0x30)
+#define KEY_C_CEDILLA            (136+0x33)
+#define KEY_MASCULINE_ORDINAL    (136+0x34)
+#define KEY_TILDE                (136+0x31)
+
+#endif
+#endif
diff --git a/lib/Bad_Usb_Lib/USBHIDKeyboard.cpp b/lib/Bad_Usb_Lib/USBHIDKeyboard.cpp
@@ -200,7 +200,9 @@ void USBHIDKeyboard::releaseAll(void)
 size_t USBHIDKeyboard::write(uint8_t c)
 {
     uint8_t p = press(c);  // Keydown
+    delay(70);
     release(c);            // Keyup
+    delay(70);
     return p;              // just return the result of press() since release() almost always returns 1
 }
 

diff --git a/lib/Bad_Usb_Lib/USBHIDKeyboard.h b/lib/Bad_Usb_Lib/USBHIDKeyboard.h
@@ -117,6 +117,7 @@ extern const uint8_t KeyboardLayout_es_ES[];
 extern const uint8_t KeyboardLayout_fr_FR[];
 extern const uint8_t KeyboardLayout_it_IT[];
 extern const uint8_t KeyboardLayout_pt_PT[];
+extern const uint8_t KeyboardLayout_pt_BR[];
 extern const uint8_t KeyboardLayout_sv_SE[];
 extern const uint8_t KeyboardLayout_da_DK[];
 extern const uint8_t KeyboardLayout_hu_HU[];

diff --git a/src/bad_usb.cpp b/src/bad_usb.cpp
@@ -241,7 +241,8 @@ void usb_setup() {
 
   options = {
     {"US Inter", [=]()      { chooseKb(KeyboardLayout_en_US); }},
-    {"PT-BR ABNT", [=]()    { chooseKb(KeyboardLayout_pt_PT); }},
+    {"PT-BR ABNT2", [=]()    { chooseKb(KeyboardLayout_pt_BR); }},
+    {"PT-PT", [=]()    { chooseKb(KeyboardLayout_pt_PT); }},
     {"AZERTY FR", [=]()     { chooseKb(KeyboardLayout_fr_FR); }},
     {"es-Espñol", [=]()     { chooseKb(KeyboardLayout_es_ES); }},
     {"it-Italiano", [=]()   { chooseKb(KeyboardLayout_it_IT); }},

diff --git a/src/scan_hosts.cpp b/src/scan_hosts.cpp
@@ -62,7 +62,7 @@ void local_scan_setup() {
     log_d("Hosts que responderam ao ping:");
     for (IPAddress ip : responderam) {
         String txt = "..." + String(ip[2]) + "." + String(ip[3]);
-        options.push_back({ txt.c_str(), [=](){ scanPorts(ip); }});
+        options.push_back({ txt.c_str(), [=](){ afterScanOptions(ip); }});
     }
 
     while(!checkEscPress()) {

diff --git a/src/wifi_atks.cpp b/src/wifi_atks.cpp
@@ -38,8 +38,11 @@ wifi_ap_record_t ap_record;
 ***************************************************************************************/
 void wsl_bypasser_send_raw_frame(const uint8_t *frame_buffer, int size){
     esp_wifi_80211_tx(WIFI_IF_AP, frame_buffer, size, false);
+    delay(1);
     esp_wifi_80211_tx(WIFI_IF_AP, frame_buffer, size, false);
+    delay(1);
     esp_wifi_80211_tx(WIFI_IF_AP, frame_buffer, size, false);
+    delay(1);
 }