Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-12 03:28:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'topic/johanna/tls13-extensions' into topic/johanna/ocsp-sct-validate

Browse source
This commit is contained in:
Johanna Amann 2017-04-05 12:04:15 -07:00
commit 61906fe7fb
15 changed files with 204 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
testing/btest/Baseline/scripts.base.protocols.ssl.dpd/.stdout
View file

@ -8,3 +8,6 @@ Start test run
Client hello, 10.0.0.80, 68.233.76.12, 771
Start test run
Client hello, 192.168.6.217, 67.207.128.99, 771
Start test run
Client hello, 192.168.6.240, 139.162.123.134, 771
Client hello, 192.168.6.240, 139.162.123.134, 771

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

BIN
testing/btest/Traces/tls/tls-13draft19-early-data.pcap Normal file
View file

Binary file not shown.

2
testing/btest/scripts/base/frameworks/input/missing-file-initially.bro
View file

@ -8,7 +8,7 @@
# @TEST-EXEC: sleep 2; mv does-not-exist.dat does-not-exist-again.dat; echo "Streaming still works" >> does-not-exist-again.dat
# @TEST-EXEC: btest-bg-wait -k 3
# @TEST-EXEC: btest-diff bro/.stdout
# @TEST-EXEC: btest-diff bro/.stderr
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff bro/.stderr
@TEST-START-FILE does-exist.dat
#separator \x09

1
testing/btest/scripts/base/protocols/ssl/dpd.test
View file

@ -2,6 +2,7 @@
# @TEST-EXEC: bro -b -r $TRACES/tls/ssl.v3.trace %INPUT
# @TEST-EXEC: bro -b -r $TRACES/tls/tls1.2.trace %INPUT
# @TEST-EXEC: bro -b -r $TRACES/tls/tls-early-alert.trace %INPUT
# @TEST-EXEC: bro -b -r $TRACES/tls/tls-13draft19-early-data.pcap %INPUT
# @TEST-EXEC: btest-diff .stdout
@load base/frameworks/dpd

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];
}