From: Mats Klepsland Date: Thu, 22 Mar 2018 12:27:00 +0000 (+0100) Subject: app-layer-ssl: use BIT_U32 for flags X-Git-Tag: suricata-4.1.0-rc1~176 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f0cfc0717f8b39f50d9846b386005ade89cb966;p=thirdparty%2Fsuricata.git app-layer-ssl: use BIT_U32 for flags --- diff --git a/src/app-layer-ssl.h b/src/app-layer-ssl.h index 160f70f26f..882a8f2f23 100644 --- a/src/app-layer-ssl.h +++ b/src/app-layer-ssl.h @@ -66,42 +66,42 @@ enum { }; /* Flag to indicate that server will now on send encrypted msgs */ -#define SSL_AL_FLAG_SERVER_CHANGE_CIPHER_SPEC 0x0001 +#define SSL_AL_FLAG_SERVER_CHANGE_CIPHER_SPEC BIT_U32(0) /* Flag to indicate that client will now on send encrypted msgs */ -#define SSL_AL_FLAG_CLIENT_CHANGE_CIPHER_SPEC 0x0002 -#define SSL_AL_FLAG_CHANGE_CIPHER_SPEC 0x0004 +#define SSL_AL_FLAG_CLIENT_CHANGE_CIPHER_SPEC BIT_U32(1) +#define SSL_AL_FLAG_CHANGE_CIPHER_SPEC BIT_U32(2) /* SSL related flags */ -#define SSL_AL_FLAG_SSL_CLIENT_HS 0x0008 -#define SSL_AL_FLAG_SSL_SERVER_HS 0x0010 -#define SSL_AL_FLAG_SSL_CLIENT_MASTER_KEY 0x0020 -#define SSL_AL_FLAG_SSL_CLIENT_SSN_ENCRYPTED 0x0040 -#define SSL_AL_FLAG_SSL_SERVER_SSN_ENCRYPTED 0x0080 -#define SSL_AL_FLAG_SSL_NO_SESSION_ID 0x0100 +#define SSL_AL_FLAG_SSL_CLIENT_HS BIT_U32(3) +#define SSL_AL_FLAG_SSL_SERVER_HS BIT_U32(4) +#define SSL_AL_FLAG_SSL_CLIENT_MASTER_KEY BIT_U32(5) +#define SSL_AL_FLAG_SSL_CLIENT_SSN_ENCRYPTED BIT_U32(6) +#define SSL_AL_FLAG_SSL_SERVER_SSN_ENCRYPTED BIT_U32(7) +#define SSL_AL_FLAG_SSL_NO_SESSION_ID BIT_U32(8) /* flags specific to detect-ssl-state keyword */ -#define SSL_AL_FLAG_STATE_CLIENT_HELLO 0x0200 -#define SSL_AL_FLAG_STATE_SERVER_HELLO 0x0400 -#define SSL_AL_FLAG_STATE_CLIENT_KEYX 0x0800 -#define SSL_AL_FLAG_STATE_SERVER_KEYX 0x1000 -#define SSL_AL_FLAG_STATE_UNKNOWN 0x2000 +#define SSL_AL_FLAG_STATE_CLIENT_HELLO BIT_U32(9) +#define SSL_AL_FLAG_STATE_SERVER_HELLO BIT_U32(10) +#define SSL_AL_FLAG_STATE_CLIENT_KEYX BIT_U32(11) +#define SSL_AL_FLAG_STATE_SERVER_KEYX BIT_U32(12) +#define SSL_AL_FLAG_STATE_UNKNOWN BIT_U32(13) /* flag to indicate that session is finished */ -#define SSL_AL_FLAG_STATE_FINISHED 0x4000 +#define SSL_AL_FLAG_STATE_FINISHED BIT_U32(14) /* flags specific to HeartBeat state */ -#define SSL_AL_FLAG_HB_INFLIGHT 0x8000 -#define SSL_AL_FLAG_HB_CLIENT_INIT 0x10000 -#define SSL_AL_FLAG_HB_SERVER_INIT 0x20000 +#define SSL_AL_FLAG_HB_INFLIGHT BIT_U32(15) +#define SSL_AL_FLAG_HB_CLIENT_INIT BIT_U32(16) +#define SSL_AL_FLAG_HB_SERVER_INIT BIT_U32(17) /* flag to indicate that handshake is done */ -#define SSL_AL_FLAG_HANDSHAKE_DONE 0x80000 +#define SSL_AL_FLAG_HANDSHAKE_DONE BIT_U32(18) /* A session ID in the Client Hello message, indicating the client wants to resume a session */ -#define SSL_AL_FLAG_SSL_CLIENT_SESSION_ID 0x100000 +#define SSL_AL_FLAG_SSL_CLIENT_SESSION_ID BIT_U32(19) /* Session resumed without a full handshake */ -#define SSL_AL_FLAG_SESSION_RESUMED 0x200000 +#define SSL_AL_FLAG_SESSION_RESUMED BIT_U32(20) /* config flags */ #define SSL_TLS_LOG_PEM (1 << 0)