diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-03-28 22:28:13 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-29 05:19:32 +0000 |
| commit | f7060112b7e83edd844c90a397e60301ee5f1c29 (patch) | |
| tree | 14487a41960bc8cd8f96765dc79dbb686c0691d7 /epan/dissectors/packet-ssl-utils.h | |
| parent | 2de68eb47ff076c3a7e17e278098a584f367f391 (diff) | |
TLS: fix decryption with Encrypt-then-MAC (RFC 7366)
Bug: 13522
Change-Id: I0dfe30e086c3ef1a4f96f22e2db46e4d4cc7dffa
Reviewed-on: https://code.wireshark.org/review/20771
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 3219cc2fac..d605aa9ec2 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -259,6 +259,7 @@ typedef struct _StringInfo { #define SSL_CLIENT_EXTENDED_MASTER_SECRET (1<<7) #define SSL_SERVER_EXTENDED_MASTER_SECRET (1<<8) #define SSL_NEW_SESSION_TICKET (1<<10) +#define SSL_ENCRYPT_THEN_MAC (1<<11) #define SSL_EXTENDED_MASTER_SECRET_MASK (SSL_CLIENT_EXTENDED_MASTER_SECRET|SSL_SERVER_EXTENDED_MASTER_SECRET) @@ -361,7 +362,7 @@ typedef struct _SslDecoder { typedef struct { const gchar *name; - gint len; + guint len; } SslDigestAlgo; typedef struct _SslRecordInfo { |