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

A few tabbing fixes in TLS 1.3 support

Browse source
This commit is contained in:
Johanna Amann 2016-10-07 14:09:49 -07:00
parent fdef28ce7c
commit c2612a0ae1
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/analyzer/protocol/ssl/tls-handshake-protocol.pac
View file

@ -100,16 +100,16 @@ type ClientHelloCookie(rec: HandshakeRecord) = record {
# TLS 1.3 server hello is different from earlier versions. Trick around a # TLS 1.3 server hello is different from earlier versions. Trick around a
# bit, route 1.3 requests to a different record than earlier. # bit, route 1.3 requests to a different record than earlier.
type ServerHelloChoice(rec: HandshakeRecord) = record { type ServerHelloChoice(rec: HandshakeRecord) = record {
server_version0 : uint8; server_version0 : uint8;
server_version1 : uint8; server_version1 : uint8;
hello: case parsed_version of { hello: case parsed_version of {
TLSv13, TLSv13_draft -> hello13: ServerHello13(rec, server_version); TLSv13, TLSv13_draft -> hello13: ServerHello13(rec, server_version);
default -> helloclassic: ServerHello(rec, server_version); default -> helloclassic: ServerHello(rec, server_version);
} &requires(server_version) &requires(parsed_version); } &requires(server_version) &requires(parsed_version);
} &let { } &let {
server_version : uint16 = (server_version0 << 8) | server_version1; server_version : uint16 = (server_version0 << 8) | server_version1;
parsed_version : uint16 = case server_version0 of { parsed_version : uint16 = case server_version0 of {
0x7F -> 0x7F00; # map any draft version to 00 0x7F -> 0x7F00; # map any draft version to 00
default -> server_version; default -> server_version;
}; };
}; };
@ -540,12 +540,12 @@ type ServerHelloKeyShare(rec: HandshakeRecord) = record {
}; };
type ClientHelloKeyShare(rec: HandshakeRecord) = record { type ClientHelloKeyShare(rec: HandshakeRecord) = record {
length: uint16; length: uint16;
keyshares : KeyShareEntry[] &until($input.length() == 0); keyshares : KeyShareEntry[] &until($input.length() == 0);
}; };
type KeyShare(rec: HandshakeRecord) = case rec.msg_type of { type KeyShare(rec: HandshakeRecord) = case rec.msg_type of {
CLIENT_HELLO -> client_hello_keyshare : ClientHelloKeyShare(rec); CLIENT_HELLO -> client_hello_keyshare : ClientHelloKeyShare(rec);
SERVER_HELLO -> server_hello_keyshare : ServerHelloKeyShare(rec); SERVER_HELLO -> server_hello_keyshare : ServerHelloKeyShare(rec);
# ... well, we don't parse hello retry requests yet, because I don't have an example of them on the wire. # ... well, we don't parse hello retry requests yet, because I don't have an example of them on the wire.
default -> other : bytestring &restofdata &transient; default -> other : bytestring &restofdata &transient;