imap authplain support

hackerschoice · Dec 1, 2024 · 15b82e3 · 15b82e3
1 parent e8d567e
commit 15b82e3
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/crc32.h b/crc32.h
@@ -3,7 +3,7 @@
 #ifndef __DS_CRC32_H__
 #define __DS_CRC32_H__ 1
 
-#define CRC32_INITIAL         (0xffffffffUL)
+#define CRC32_INITIAL         ((uint32_t)0xffffffff)
 #define CRC32_INITIAL_STATE   (~CRC32_INITIAL)
 
 #include <stdint.h>

diff --git a/dsniff.magic b/dsniff.magic
@@ -16,6 +16,12 @@
 0	string		POST\ /		http
 0	string		CONNECT\ 	http
 
+1	string		\ ID\ 	imap
+2	string		\ ID\ 	imap
+3	string		\ ID\ 	imap
+4	string		\ ID\ 	imap
+5	string		\ ID\ 	imap
+
 1	string		\ LOGIN\ 	imap
 2	string		\ LOGIN\ 	imap
 3	string		\ LOGIN\ 	imap

diff --git a/dsniff_magic.h b/dsniff_magic.h
@@ -14,6 +14,12 @@ static char *mgx[] = {\
 "0	string		POST\\ /		http", \
 "0	string		CONNECT\\ 	http", \
 "", \
+"1	string		\\ ID\\ 	imap", \
+"2	string		\\ ID\\ 	imap", \
+"3	string		\\ ID\\ 	imap", \
+"4	string		\\ ID\\ 	imap", \
+"5	string		\\ ID\\ 	imap", \
+"", \
 "1	string		\\ LOGIN\\ 	imap", \
 "2	string		\\ LOGIN\\ 	imap", \
 "3	string		\\ LOGIN\\ 	imap", \

diff --git a/magic.c b/magic.c
@@ -556,7 +556,6 @@ mconvert(union VALUETYPE *p, struct magic *m)
 	case STRING:
 	{
 		char *ptr;
-
 		/* Null terminate and eat the return */
 		p->s[sizeof(p->s) - 1] = '\0';
 		if ((ptr = strchr(p->s, '\n')) != NULL)

diff --git a/record.c b/record.c
@@ -247,7 +247,7 @@ record(in_addr_t src, in_addr_t dst, int proto, u_short sport, u_short dport,
 	if (!Opt_show_dups) {
 		// Check for duplicates.
 		crc = dc_meta.crc;
-		// Add entire buffer unless decodeing function already added 'uniq' items.
+		// Add entire buffer unless decoding function already added 'uniq' items.
 		if (crc == CRC32_INITIAL_STATE)
 			crc = crc32_update(buf, len, crc);
 		crc = crc32_update(&src, sizeof src, crc);

diff --git a/trigger.c b/trigger.c
@@ -219,7 +219,7 @@ trigger_set_magic(int proto, int num, u_char *buf, int len)
 	char *name;
 
 	if ((name = magic_match(buf, len)) == NULL)
-		return (NULL);
+		return NULL;
 
 	t = NULL;
 	tr.num = num;