diff options
author | Anders Broman <anders.broman@ericsson.com> | 2013-05-16 05:36:13 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2013-05-16 05:36:13 +0000 |
commit | c1f144e9aaf430679d4fb888644b8d6e669ebd0d (patch) | |
tree | e6ed95a8ab6c7e8b46bd1df3b4d48b9856216570 /epan/dissectors/packet-ssl-utils.h | |
parent | ae74ef756be1b9f1edde594fb34ad1fe0e2c561c (diff) |
From Dirk:
improve PKCS12 SSL certificate load.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8641
svn path=/trunk/; revision=49327
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
-rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index 090b30bccc..fc7fed9f2e 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -407,9 +407,6 @@ ssl_cipher_setiv(SSL_CIPHER_CTX *cipher, guchar* iv, gint iv_len); extern Ssl_private_key_t * ssl_load_key(FILE* fp); -extern Ssl_private_key_t * -ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd); - /** Deallocate the memory used for specified key @param key pointer to the key to be freed */ void |