mirror of
https://github.com/zeek/zeek.git
synced 2025-10-10 18:48:20 +00:00
Updated SSL analyzer and Bro script with lots of new ciphers.
This commit is contained in:
Seth Hall
parent
5bf18fdb7f
commit
06ca14ea45
4 changed files with 1316 additions and 498 deletions
|
|
@ -389,16 +389,16 @@ SSL_CipherSpec SSL_CipherSpecs[] = {
|
|||
96,
|
||||
160
|
||||
},
|
||||
{ SSL_FORTEZZA_KEA_WITH_RC4_128_SHA,
|
||||
SSL_CIPHER_TYPE_STREAM,
|
||||
SSL_FLAG_SSLv30,
|
||||
SSL_CIPHER_RC4,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_FORTEZZA_KEA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
//{ SSL_FORTEZZA_KEA_WITH_RC4_128_SHA,
|
||||
// SSL_CIPHER_TYPE_STREAM,
|
||||
// SSL_FLAG_SSLv30,
|
||||
// SSL_CIPHER_RC4,
|
||||
// SSL_MAC_SHA,
|
||||
// SSL_KEY_EXCHANGE_FORTEZZA_KEA,
|
||||
// 0,
|
||||
// 128,
|
||||
// 160
|
||||
//},
|
||||
// --- special SSLv3 FIPS ciphers
|
||||
{ SSL_RSA_FIPS_WITH_DES_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
|
|
@ -591,7 +591,439 @@ SSL_CipherSpec SSL_CipherSpecs[] = {
|
|||
0,
|
||||
256,
|
||||
160
|
||||
}
|
||||
},
|
||||
{ TLS_RSA_WITH_CAMELLIA_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_RSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DH_DSS,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DH_RSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DHE_DSS,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DHE_RSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DH_ANON,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_RSA_WITH_CAMELLIA_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_RSA,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DH_DSS,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DH_RSA,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DHE_DSS,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DHE_RSA,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_CAMELLIA,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DH_ANON,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_3DES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDHE_ECDSA,
|
||||
0,
|
||||
168,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_AES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDHE_ECDSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_AES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDHE_ECDSA,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDHE_ECDSA_WITH_NULL_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_NULL,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDHE_ECDSA,
|
||||
0,
|
||||
0,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_RC4,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDHE_ECDSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_3DES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDHE_RSA,
|
||||
0,
|
||||
168,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_AES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDHE_RSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_AES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDHE_RSA,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDHE_RSA_WITH_NULL_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_NULL,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDHE_RSA,
|
||||
0,
|
||||
0,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDHE_RSA_WITH_RC4_128_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_RC4,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDHE_RSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_3DES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_ECDSA,
|
||||
0,
|
||||
168,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_AES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_ECDSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_AES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_ECDSA,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_ECDSA_WITH_NULL_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_NULL,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_ECDSA,
|
||||
0,
|
||||
0,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_ECDSA_WITH_RC4_128_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_RC4,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_ECDSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_3DES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_RSA,
|
||||
0,
|
||||
168,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_RSA_WITH_AES_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_AES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_RSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_RSA_WITH_AES_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_AES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_RSA,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_RSA_WITH_NULL_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_NULL,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_RSA,
|
||||
0,
|
||||
0,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_RSA_WITH_RC4_128_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_RC4,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_RSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_3DES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_ANON,
|
||||
0,
|
||||
168,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_anon_WITH_AES_128_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_AES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_ANON,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_anon_WITH_AES_256_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_AES,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_ANON,
|
||||
0,
|
||||
256,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_anon_WITH_NULL_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_NULL,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_ANON,
|
||||
0,
|
||||
0,
|
||||
160
|
||||
},
|
||||
{ TLS_ECDH_anon_WITH_RC4_128_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_RC4,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_ECDH_ANON,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_RSA_WITH_SEED_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_SEED,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_RSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_DH_DSS_WITH_SEED_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_SEED,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DH_DSS,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_DH_RSA_WITH_SEED_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_SEED,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DH_RSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_DHE_DSS_WITH_SEED_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_SEED,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DHE_DSS,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_DHE_RSA_WITH_SEED_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_SEED,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DHE_RSA,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
{ TLS_DH_anon_WITH_SEED_CBC_SHA,
|
||||
SSL_CIPHER_TYPE_BLOCK,
|
||||
SSL_FLAG_SSLv30 | SSL_FLAG_SSLv31,
|
||||
SSL_CIPHER_SEED,
|
||||
SSL_MAC_SHA,
|
||||
SSL_KEY_EXCHANGE_DH_ANON,
|
||||
0,
|
||||
128,
|
||||
160
|
||||
},
|
||||
|
||||
|
||||
};
|
||||
|
||||
const uint SSL_CipherSpecs_Count =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue