diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-09-11 00:59:37 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-09-11 05:11:14 +0000 |
| commit | 1d3ca5ad41fc3a725442439464f9ead944b21779 (patch) | |
| tree | 7a58470c24c5f6f872bfb5f121812ae4c15d56b0 /epan/dissectors/packet-ssl-utils.h | |
| parent | 845835b8dba71bb248238dcb8ae18d59e4e543f0 (diff) | |
TLS13: add new Signature Algorithms
Add support for dissecting new TLS 1.3 Signature Algorithms (like
RSASSA-PSS) and add the text to the tree item to prevent expanding the
item. The field names are preserved for backwards compatibility.
Change-Id: Ieb8c7a86f6e19b8d6c89590d87d59a01d9bb1351
Ping-Bug: 12779
Reviewed-on: https://code.wireshark.org/review/23474
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index c0d7551ce4..eb4dd985dd 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -242,6 +242,7 @@ extern const value_string pct_error_code[]; extern const value_string tls_hello_extension_types[]; extern const value_string tls_hash_algorithm[]; extern const value_string tls_signature_algorithm[]; +extern const value_string tls13_signature_algorithm[]; extern const value_string tls_certificate_type[]; extern const value_string tls_cert_chain_type[]; extern const value_string tls_cert_status_type[]; @@ -1330,24 +1331,24 @@ ssl_common_dissect_t name = { \ "Length of Signature Hash Algorithms", HFILL } \ }, \ { & name .hf.hs_sig_hash_algs, \ - { "Signature Hash Algorithms", prefix ".handshake.sig_hash_algs", \ + { "Signature Algorithms", prefix ".handshake.sig_hash_algs", \ FT_NONE, BASE_NONE, NULL, 0x0, \ - "List of Signature Hash Algorithms", HFILL } \ + "List of supported Signature Algorithms", HFILL } \ }, \ { & name .hf.hs_sig_hash_alg, \ - { "Signature Hash Algorithm", prefix ".handshake.sig_hash_alg", \ - FT_UINT16, BASE_HEX, NULL, 0x0, \ + { "Signature Algorithm", prefix ".handshake.sig_hash_alg", \ + FT_UINT16, BASE_HEX, VALS(tls13_signature_algorithm), 0x0, \ NULL, HFILL } \ }, \ { & name .hf.hs_sig_hash_hash, \ { "Signature Hash Algorithm Hash", prefix ".handshake.sig_hash_hash", \ FT_UINT8, BASE_DEC, VALS(tls_hash_algorithm), 0x0, \ - NULL, HFILL } \ + "Hash algorithm (TLS 1.2)", HFILL } \ }, \ { & name .hf.hs_sig_hash_sig, \ { "Signature Hash Algorithm Signature", prefix ".handshake.sig_hash_sig", \ FT_UINT8, BASE_DEC, VALS(tls_signature_algorithm), 0x0, \ - NULL, HFILL } \ + "Signature algorithm (TLS 1.2)", HFILL } \ }, \ { & name .hf.hs_client_keyex_epms_len, \ { "Encrypted PreMaster length", prefix ".handshake.epms_len", \ |