diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-12-08 02:12:48 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-12-08 02:12:48 +0000 |
| commit | 6c5a93d7d149a35cff5b9667caa73251c31025c6 (patch) | |
| tree | c718d1d480ae9b94e524b62b324d6b814d58be99 /epan/dissectors/packet-ssl-utils.h | |
| parent | 21ca76a3ad81c0d8b4a3cad8b12a3f41b36455bb (diff) | |
Fix invalid read and correct PSK upper bound. Bug 9512 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9512)
From Peter Wu.
svn path=/trunk/; revision=53843
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 91ae33d19b..d09966fc48 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -44,7 +44,6 @@ #define SSL_DECRYPT_DEBUG #define SSL_CIPHER_CTX gcry_cipher_hd_t -#define SSL_PSK_KEY guchar #ifdef SSL_FAST #define SSL_PRIVATE_KEY gcry_mpi_t #else /* SSL_FAST */ @@ -53,7 +52,6 @@ #else /* HAVE_LIBGNUTLS */ #define SSL_CIPHER_CTX void* #define SSL_PRIVATE_KEY void -#define SSL_PSK_KEY void #endif /* HAVE_LIBGNUTLS */ @@ -355,7 +353,7 @@ typedef struct _SslDecryptSession { SslDecoder *server_new; SslDecoder *client_new; SSL_PRIVATE_KEY* private_key; - SSL_PSK_KEY* psk; + StringInfo psk; guint32 version; guint16 version_netorder; StringInfo app_data_segment; |