diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-06-24 06:01:11 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-06-24 06:01:11 +0000 |
| commit | 7535d3f095c6f03348441f1efe51c185ca218ccc (patch) | |
| tree | d3a9cdf95a6222d62dbd2f9c45cf905b1c3ed5e6 /epan/dissectors/packet-ssl-utils.h | |
| parent | 2fe73ff607e3190a4d436af2b480c8f37546b26c (diff) | |
From "wiresharkbugzilla@jdkbx.cjb.net":
Support for RFC4279 Pre-Shared Key Ciphersuites for Transport Layer Security (TLS)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4853
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@33309 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 5184134fd1..1de9b8cb7c 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -44,6 +44,7 @@ #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 */ @@ -52,6 +53,7 @@ #else /* HAVE_LIBGNUTLS */ #define SSL_CIPHER_CTX void* #define SSL_PRIVATE_KEY void +#define SSL_PSK_KEY void #endif /* HAVE_LIBGNUTLS */ @@ -241,6 +243,7 @@ typedef struct _SslDecoder { #define KEX_RSA 0x10 #define KEX_DH 0x11 +#define KEX_PSK 0x12 #define SIG_RSA 0x20 #define SIG_DSS 0x21 @@ -305,6 +308,7 @@ typedef struct _SslDecryptSession { SslDecoder *server_new; SslDecoder *client_new; SSL_PRIVATE_KEY* private_key; + SSL_PSK_KEY* psk; guint32 version; guint16 version_netorder; StringInfo app_data_segment; |