URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=50dc0e8edb990dbb2340cc339ffbc6adc372bb21
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
50dc0e8 by Peter Wu (peter@xxxxxxxxxxxxx):
ssl: improve interaction with heuristics subdissectors
Do not call heuristics dissectors when the SSL application data protocol
is known (via STARTTLS or via an earlier packet in session).
When the protocol is *not* known, first try heuristics on the initial
payload. If a match is found, it can then override the protocol that
would otherwise be used due to a port number match.
The HTTP2 dissector is adjusted to take advantage of that such that
HTTP2 on non-standard ports still get detected as HTTP2. Also save
dissector registration to avoid the http2 dissector from showing up
as "(null)". Now HTTP2 is really shown as "http2" and not "http" in
the "Application Data Protocol"!
The CredSSP dissector is untested and not modified as I don't know if
the whole stream will be SSL.
Tested with fix-ssl.pcap and a http2 capture (from bug 11331) wrapped
in SSL (without ALPN).
Change-Id: I134e2d4ac22287bc0a5aeadb1e38cb4059fa108b
Reviewed-on: https://code.wireshark.org/review/13179
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 6fba2d2 fix,ssl: "fix" FIX over SSL
adds 50dc0e8 ssl: improve interaction with heuristics subdissectors
Summary of changes:
epan/dissectors/packet-http2.c | 16 +++++--
epan/dissectors/packet-ssl.c | 101 ++++++++++++++++++++++++++--------------
2 files changed, 79 insertions(+), 38 deletions(-)