aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ssl-utils.c
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2014-04-26 00:12:12 +0200
committerEvan Huus <eapache@gmail.com>2014-04-26 15:34:38 +0000
commitc7cbdb4f22de4dc3d37906d7b67bdf204835a243 (patch)
tree6277e818b24d5aed678d63a9d1d7f6c1dea5fbd2 /epan/dissectors/packet-ssl-utils.c
parent03cb700571a814fc991668526e5a90a3083e73af (diff)
Change ssl_find_private_key to void
No caller checks its return value (which is always 0). Change-Id: I18461ee6e5d369722c8c2b2ea1e409423aa5d631 Reviewed-on: https://code.wireshark.org/review/1365 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
-rw-r--r--epan/dissectors/packet-ssl-utils.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c
index e175d63ef7..cad65c3565 100644
--- a/epan/dissectors/packet-ssl-utils.c
+++ b/epan/dissectors/packet-ssl-utils.c
@@ -3659,7 +3659,7 @@ void ssl_free_key(Ssl_private_key_t* key)
g_free((Ssl_private_key_t*)key);
}
-gint
+void
ssl_find_private_key(SslDecryptSession *ssl_session, GHashTable *key_hash, GTree* associations, packet_info *pinfo) {
SslService dummy;
char ip_addr_any[] = {0,0,0,0};
@@ -3667,7 +3667,7 @@ ssl_find_private_key(SslDecryptSession *ssl_session, GHashTable *key_hash, GTree
Ssl_private_key_t * private_key;
if (!ssl_session) {
- return 0;
+ return;
}
/* we need to know which side of the conversation is speaking */
@@ -3713,8 +3713,6 @@ ssl_find_private_key(SslDecryptSession *ssl_session, GHashTable *key_hash, GTree
} else {
ssl_session->private_key = private_key->sexp_pkey;
}
-
- return 0;
}
void