Label SMTP w/ STARTTLS as SMTPS *and* dissect TLS clho. (#1639)

* Label SMTP w/ STARTTLS as SMTPS *and* dissect TLS clho.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

* Revert "SMTP with STARTTLS is now identified as SMTPS"

This reverts commit 52d987b603.

* Revert "Compilation fix"

This reverts commit c019946f60.

* Sync unit tests.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
This commit is contained in:
Toni
2022-07-06 12:40:25 +02:00
committed by GitHub
parent c019946f60
commit 175f863665
6 changed files with 39 additions and 45 deletions
-16
View File
@@ -453,20 +453,4 @@ static inline u_int64_t get_u_int64_t(const u_int8_t* X, int O)
#define ETH_P_PPPoE 0x8864
#endif
#define SMTP_BIT_220 0x01
#define SMTP_BIT_250 0x02
#define SMTP_BIT_235 0x04
#define SMTP_BIT_334 0x08
#define SMTP_BIT_354 0x10
#define SMTP_BIT_HELO_EHLO 0x20
#define SMTP_BIT_MAIL 0x40
#define SMTP_BIT_RCPT 0x80
#define SMTP_BIT_AUTH_LOGIN 0x100
#define SMTP_BIT_STARTTLS 0x200
#define SMTP_BIT_DATA 0x400
#define SMTP_BIT_NOOP 0x800
#define SMTP_BIT_RSET 0x1000
#define SMTP_BIT_TlRM 0x2000
#define SMTP_BIT_AUTH_PLAIN 0x4000
#endif /* __NDPI_DEFINE_INCLUDE_FILE__ */