Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-16 21:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/johanna/tls13-extensions'

Browse source 
* origin/topic/johanna/tls13-extensions:
  Add support for two TLS 1.3 extensions.
This commit is contained in:
Robin Sommer 2017-04-21 14:15:23 -07:00
commit bf15ff4c83
8 changed files with 186 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

66
testing/btest/Baseline/scripts.base.protocols.ssl.tls-extension-events/.stdout
View file

@ -20,3 +20,69 @@ uncompressed
ansiX962_compressed_prime
ansiX962_compressed_char2
ALPN, 192.168.4.149, 74.125.239.152, [spdy/3.1]
Point formats, 192.168.6.240, 139.162.123.134, T
uncompressed
ansiX962_compressed_prime
ansiX962_compressed_char2
Curves, 192.168.6.240, 139.162.123.134
x25519
secp256r1
secp521r1
secp384r1
signature_algorithm, 192.168.6.240, 139.162.123.134
sha256, ecdsa
sha384, ecdsa
sha512, ecdsa
unknown-8, unknown-4
unknown-8, unknown-5
unknown-8, unknown-6
sha256, rsa
sha384, rsa
sha512, rsa
sha1, ecdsa
sha1, rsa
sha1, dsa
sha256, dsa
sha384, dsa
sha512, dsa
supported_versions(, 192.168.6.240, 139.162.123.134
TLSv13-draft19
TLSv12
TLSv11
TLSv10
psk_key_exchange_modes, 192.168.6.240, 139.162.123.134
1
0
Point formats, 192.168.6.240, 139.162.123.134, T
uncompressed
ansiX962_compressed_prime
ansiX962_compressed_char2
Curves, 192.168.6.240, 139.162.123.134
x25519
secp256r1
secp521r1
secp384r1
signature_algorithm, 192.168.6.240, 139.162.123.134
sha256, ecdsa
sha384, ecdsa
sha512, ecdsa
unknown-8, unknown-4
unknown-8, unknown-5
unknown-8, unknown-6
sha256, rsa
sha384, rsa
sha512, rsa
sha1, ecdsa
sha1, rsa
sha1, dsa
sha256, dsa
sha384, dsa
sha512, dsa
supported_versions(, 192.168.6.240, 139.162.123.134
TLSv13-draft19
TLSv12
TLSv11
TLSv10
psk_key_exchange_modes, 192.168.6.240, 139.162.123.134
1
0

15
testing/btest/scripts/base/protocols/ssl/tls-extension-events.test
View file

@ -1,4 +1,5 @@
# @TEST-EXEC: bro -C -r $TRACES/tls/chrome-34-google.trace %INPUT
# @TEST-EXEC: bro -C -r $TRACES/tls/tls-13draft19-early-data.pcap %INPUT
# @TEST-EXEC: btest-diff .stdout
event ssl_extension_elliptic_curves(c: connection, is_orig: bool, curves: index_vec)
@ -33,3 +34,17 @@ event ssl_extension_signature_algorithm(c: connection, is_orig: bool, signature_
print SSL::hash_algorithms[signature_algorithms[i]$HashAlgorithm], SSL::signature_algorithms[signature_algorithms[i]$SignatureAlgorithm];
}
}
event ssl_extension_supported_versions(c: connection, is_orig: bool, versions: index_vec)
{
print "supported_versions(", c$id$orig_h, c$id$resp_h;
for ( i in versions )
print SSL::version_strings[versions[i]];
}
event ssl_extension_psk_key_exchange_modes(c: connection, is_orig: bool, modes: index_vec)
{
print "psk_key_exchange_modes", c$id$orig_h, c$id$resp_h;
for ( i in modes )
print modes[i];
}