summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2014-02-04 13:51:41 +0100
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2014-02-04 13:05:07 +0000
commit9f96c730d87f9d5621d5c9e96c2676a87937c02a (patch)
tree125310f78b1788aa1572fd87422a1de317420878
parent6d0f3d894d1fb0ec99a25c2b3dac18a469ade670 (diff)
downloadwireshark-9f96c730d87f9d5621d5c9e96c2676a87937c02a.tar.gz
Fix indent (Remove tabs and use 4 spaces)
Change-Id: Ide85336be3dca4059619bb91707bfc49e25af63d Reviewed-on: https://code.wireshark.org/review/108 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r--epan/dissectors/packet-ssl-utils.c26
-rw-r--r--epan/dissectors/packet-ssl-utils.h6
2 files changed, 16 insertions, 16 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index 4dc89c8d83..2a4a4478a5 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -3668,8 +3668,8 @@ ssl_session_init(SslDecryptSession* ssl_session)
ssl_session->session_id.data = ssl_session->_session_id;
ssl_session->client_random.data = ssl_session->_client_random;
ssl_session->server_random.data = ssl_session->_server_random;
- ssl_session->session_ticket.data = ssl_session->_session_ticket;
- ssl_session->session_ticket.data_len = 0;
+ ssl_session->session_ticket.data = ssl_session->_session_ticket;
+ ssl_session->session_ticket.data_len = 0;
ssl_session->master_secret.data_len = 48;
ssl_session->server_data_for_iv.data_len = 0;
ssl_session->server_data_for_iv.data = ssl_session->_server_data_for_iv;
@@ -4805,13 +4805,13 @@ static gint
ssl_dissect_hnd_hello_ext_session_ticket(ssl_common_dissect_t *hf, tvbuff_t *tvb,
proto_tree *tree, guint32 offset, guint32 ext_len, gboolean is_client, SslDecryptSession *ssl)
{
- if(is_client && ssl && ext_len != 0)
- {
- /*save the ticket on the ssl opaque so that we can use it as key on server hello */
- tvb_memcpy(tvb,ssl->session_ticket.data, offset, ext_len);
- ssl->session_ticket.data_len = ext_len;
- }
- proto_tree_add_bytes_format(tree, hf->hf.hs_ext_data,
+ if(is_client && ssl && ext_len != 0)
+ {
+ /*save the ticket on the ssl opaque so that we can use it as key on server hello */
+ tvb_memcpy(tvb,ssl->session_ticket.data, offset, ext_len);
+ ssl->session_ticket.data_len = ext_len;
+ }
+ proto_tree_add_bytes_format(tree, hf->hf.hs_ext_data,
tvb, offset, ext_len, NULL,
"Data (%u byte%s)",
ext_len, plurality(ext_len, "", "s"));
@@ -5028,7 +5028,7 @@ ssl_dissect_hnd_hello_ext(ssl_common_dissect_t *hf, tvbuff_t *tvb, proto_tree *t
guint16 ext_len;
proto_item *pi;
proto_tree *ext_tree;
-
+
if (left < 2)
return offset;
@@ -5098,9 +5098,9 @@ ssl_dissect_hnd_hello_ext(ssl_common_dissect_t *hf, tvbuff_t *tvb, proto_tree *t
tvb, offset, 1, ENC_BIG_ENDIAN);
offset += ext_len;
break;
- case SSL_HND_HELLO_EXT_SESSION_TICKET:
- offset = ssl_dissect_hnd_hello_ext_session_ticket(hf, tvb, ext_tree, offset, ext_len, is_client, ssl);
- break;
+ case SSL_HND_HELLO_EXT_SESSION_TICKET:
+ offset = ssl_dissect_hnd_hello_ext_session_ticket(hf, tvb, ext_tree, offset, ext_len, is_client, ssl);
+ break;
default:
proto_tree_add_bytes_format(ext_tree, hf->hf.hs_ext_data,
tvb, offset, ext_len, NULL,
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 7bbd3a4365..b88b638102 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -162,7 +162,7 @@
#define SSL_HND_HELLO_EXT_HEARTBEAT 0x000f
#define SSL_HND_HELLO_EXT_ALPN 0x0010
#define SSL_HND_HELLO_EXT_STATUS_REQUEST_V2 0x0011
-#define SSL_HND_HELLO_EXT_SESSION_TICKET 0x0023
+#define SSL_HND_HELLO_EXT_SESSION_TICKET 0x0023
#define SSL_HND_HELLO_EXT_RENEG_INFO 0xff01
#define SSL_HND_HELLO_EXT_NPN 0x3374
#define SSL_HND_CERT_URL_TYPE_INDIVIDUAL_CERT 1
@@ -334,11 +334,11 @@ typedef struct {
typedef struct _SslDecryptSession {
guchar _master_secret[48];
guchar _session_id[256];
- guchar _session_ticket[1024];
+ guchar _session_ticket[1024];
guchar _client_random[32];
guchar _server_random[32];
StringInfo session_id;
- StringInfo session_ticket;
+ StringInfo session_ticket;
StringInfo server_random;
StringInfo client_random;
StringInfo master_secret;