diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-09-20 14:14:38 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2016-09-21 11:41:30 +0000 |
| commit | b9d4a18ad2f10cc9216d8131d9e1ddc89bfc50ac (patch) | |
| tree | 2c5b878b2ba867959e59e1d3b142bef26bff36d3 /epan/dissectors/packet-ssl-utils.h | |
| parent | 7be73201a044e8228de8e91a5f8708ebcd761015 (diff) | |
TLS: no extension length on padding extension
also remove padding function (don't needed)
Bug: 12922
Change-Id: Ie049ee21193ec82b8dc873a7dff78e9d058c7935
Reviewed-on: https://code.wireshark.org/review/17825
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index ea53192c13..21cad01bc7 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -668,8 +668,6 @@ typedef struct ssl_common_dissect { gint hs_ext_server_name_len; gint hs_ext_server_name_list_len; gint hs_ext_server_name_type; - gint hs_ext_padding; - gint hs_ext_padding_len; gint hs_ext_padding_data; gint hs_ext_type; gint hs_sig_hash_alg; @@ -752,7 +750,6 @@ typedef struct ssl_common_dissect { gint hs_ext_pre_shared_key; gint hs_ext_psk_identity; gint hs_ext_server_name; - gint hs_ext_padding; gint hs_sig_hash_alg; gint hs_sig_hash_algs; gint urlhash; @@ -865,11 +862,10 @@ ssl_common_dissect_t name = { \ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, \ }, \ /* ett */ { \ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, \ - -1, -1, -1, -1, -1, -1, -1, -1, \ + -1, -1, -1, -1, -1, -1, -1, \ }, \ /* ei */ { \ EI_INIT, EI_INIT, EI_INIT, EI_INIT, EI_INIT, \ @@ -1049,16 +1045,6 @@ ssl_common_dissect_t name = { \ FT_STRING, BASE_NONE, NULL, 0x0, \ NULL, HFILL } \ }, \ - { & name .hf.hs_ext_padding, \ - { "Padding", prefix ".handshake.extensions_padding", \ - FT_NONE, BASE_NONE, NULL, 0x0, \ - NULL, HFILL } \ - }, \ - { & name .hf.hs_ext_padding_len, \ - { "Padding length", prefix ".handshake.extensions_padding_len", \ - FT_UINT16, BASE_DEC, NULL, 0x0, \ - "Length of Padding", HFILL } \ - }, \ { & name .hf.hs_ext_padding_data, \ { "Padding Data", prefix ".handshake.extensions_padding_data", \ FT_BYTES, BASE_NONE, NULL, 0x0, \ @@ -1466,7 +1452,6 @@ ssl_common_dissect_t name = { \ & name .ett.hs_ext_pre_shared_key, \ & name .ett.hs_ext_psk_identity, \ & name .ett.hs_ext_server_name, \ - & name .ett.hs_ext_padding, \ & name .ett.hs_sig_hash_alg, \ & name .ett.hs_sig_hash_algs, \ & name .ett.urlhash, \ |