diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-10-29 16:09:17 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-10-29 18:49:26 +0000 |
| commit | 07ceb2c6dc5167bc2fe8f1f000c3a3d64571396e (patch) | |
| tree | 27a67e9dbc83e981eb5ec6d740b3da7b54aebcab /epan/dissectors/packet-ssl-utils.h | |
| parent | 9ef04d04be98a19ad108c9807ed5893f6863bae9 (diff) | |
ssl-utils: add versions to ssl debug log
Add Wireshark/GnuTLS/Libgcrypt versions to the debug log file. Remove
ssl_lib_init since it didn't do anything useful (the debug file was not
open yet so it would write... nothing).
Match more (EC)DH(E) cipher suites and try to improve the message.
Add the human-readable name besides numeric cipher suite IDs.
Change-Id: I84a33d270f91e90efc55371475b231b483fd24c9
Reviewed-on: https://code.wireshark.org/review/11403
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index a36b978ae4..4e3be07eea 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -306,6 +306,7 @@ typedef struct _SslDecoder { #define KEX_SRP_SHA 0x20 #define KEX_SRP_SHA_DSS 0x21 #define KEX_SRP_SHA_RSA 0x22 +#define KEX_IS_DH(n) ((n) >= KEX_DHE_DSS && (n) <= KEX_ECDH_RSA) #define ENC_DES 0x30 #define ENC_3DES 0x31 @@ -448,10 +449,6 @@ gboolean ssldecrypt_uat_fld_protocol_chk_cb(void*, const char*, unsigned, const gboolean ssldecrypt_uat_fld_fileopen_chk_cb(void*, const char*, unsigned, const void*, const void*, char** err); gboolean ssldecrypt_uat_fld_password_chk_cb(void*, const char*, unsigned, const void*, const void*, char** err); -/** Initialize decryption engine/ssl layer. To be called once per execution */ -extern void -ssl_lib_init(void); - /** Retrieve a SslSession, creating it if it did not already exist. * @param conversation The SSL conversation. * @param ssl_handle The dissector handle for SSL or DTLS. |