diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-12-21 21:06:01 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-12-21 21:06:01 +0000 |
| commit | 8fc1491a609b956f7cad5b0625ee8c1dd0895e45 (patch) | |
| tree | c7dd20c72484499198d106b5ba392787651f500a /epan/dissectors/packet-ssl-utils.h | |
| parent | 2ab6b0f8eb121039da65297129ab495b824b45f2 (diff) | |
Switch to using a bundled version of the openSUSE Build Service packages
for GNUTLS since they provide 32-bit and 64-bit Windows packages. We no
longer have winposixtype.h, so remove its #includes and add a ssize_t
typedef to config.h.win32.
svn path=/trunk/; revision=31341
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.h')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h index eda58ebeb6..441321f92c 100644 --- a/epan/dissectors/packet-ssl-utils.h +++ b/epan/dissectors/packet-ssl-utils.h @@ -33,10 +33,6 @@ #include <epan/value_string.h> #ifdef HAVE_LIBGNUTLS -#ifdef _WIN32 -#include <winposixtype.h> -#endif /* _WIN32 */ - #include <stdio.h> #include <gcrypt.h> #include <gnutls/x509.h> @@ -175,6 +171,7 @@ extern const value_string pct_exch_type[]; extern const value_string pct_error_code[]; extern const value_string tls_hello_extension_types[]; +/* XXX Should we use GByteArray instead? */ typedef struct _StringInfo { guchar* data; guint data_len; @@ -332,7 +329,7 @@ typedef struct _Ssl_private_key { gnutls_x509_crt_t x509_cert; gnutls_x509_privkey_t x509_pkey; #endif - SSL_PRIVATE_KEY *sexp_pkey; + SSL_PRIVATE_KEY *sexp_pkey; } Ssl_private_key_t; /** Initialize decryption engine/ssl layer. To be called once per execution */ @@ -365,7 +362,7 @@ 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 * +extern Ssl_private_key_t * ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd); /** Deallocate the memory used for specified key @@ -491,11 +488,11 @@ ssl_is_valid_content_type(guint8 type); extern void ssl_debug_printf(const gchar* fmt,...) GNUC_FORMAT_CHECK(printf,1,2); extern void -ssl_print_data(const gchar* name, const guchar* data, gint len); +ssl_print_data(const gchar* name, const guchar* data, size_t len); extern void ssl_print_string(const gchar* name, const StringInfo* data); extern void -ssl_print_text_data(const gchar* name, const guchar* data, gint len); +ssl_print_text_data(const gchar* name, const guchar* data, size_t len); extern void ssl_set_debug(gchar* name); extern void |