diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-10-04 11:22:41 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-10-07 04:09:42 +0000 |
| commit | 877fd03cbffa96bfb6c4c030ce9f8bade57cfc75 (patch) | |
| tree | 4924dfcf05e8978e4e31e99fec97c806f33ad290 /epan/dissectors/packet-ssl-utils.h | |
| parent | 40ff4ffee88977b2981e29cb4ad8658394c8442e (diff) | |
| download | wireshark-877fd03cbffa96bfb6c4c030ce9f8bade57cfc75.tar.gz | |
ssl-utils: load RSA keys based on their modulus+exponent
Load RSA private keys based on their public key instead of relying on
the user to specify a valid address and port mapping. This is more
reliable and prepares for simplification of the SSL Keys dialog.
After this change, the "address" part of the UAT dialog will be ignored
when loading the private key. The port+protocol mapping is still
imported, but should probably be removed too.
Change-Id: I4d7a2bfcf63d17e66e336ef770759f20510fc176
Reviewed-on: https://code.wireshark.org/review/10766
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 08b979f017..c09a39d4fc 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -418,11 +418,6 @@ typedef struct _SslAssociation { gboolean from_key_list; } SslAssociation; -typedef struct _SslService { - address addr; - guint port; -} SslService; - /* User Access Table */ typedef struct _ssldecrypt_assoc_t { char* ipaddr; @@ -495,10 +490,6 @@ ssl_data_set(StringInfo* buf, const guchar* src, guint len); extern gint ssl_cipher_setiv(SSL_CIPHER_CTX *cipher, guchar* iv, gint iv_len); -/* Find private key in associations */ -extern void -ssl_find_private_key(SslDecryptSession *ssl_session, GHashTable *key_hash, GTree* associations, packet_info *pinfo); - /** Search for the specified cipher suite id @param num the id of the cipher suite to be searched @param cs pointer to the cipher suite struct to be filled @@ -545,7 +536,7 @@ ssl_equal (gconstpointer v, gconstpointer v2); extern guint ssl_hash (gconstpointer v); -extern gint +extern gboolean ssl_private_key_equal (gconstpointer v, gconstpointer v2); extern guint @@ -798,7 +789,8 @@ ssl_dissect_hnd_new_ses_ticket(ssl_common_dissect_t *hf, tvbuff_t *tvb, extern void ssl_dissect_hnd_cert(ssl_common_dissect_t *hf, tvbuff_t *tvb, proto_tree *tree, guint32 offset, packet_info *pinfo, - const SslSession *session, gint is_from_server); + const SslSession *session, SslDecryptSession *ssl, + GHashTable *key_hash, gint is_from_server); extern void ssl_dissect_hnd_cert_req(ssl_common_dissect_t *hf, tvbuff_t *tvb, |