diff options
author | Richard van der Hoff <richardv@mxtelecom.com> | 2007-04-10 18:09:51 +0000 |
---|---|---|
committer | Richard van der Hoff <richardv@mxtelecom.com> | 2007-04-10 18:09:51 +0000 |
commit | 3608bc694a94526a9de963ec6ca0d24d7e56dfe3 (patch) | |
tree | 597f8f39b5ecbcd3c1a2791df5ab9e01f851dd2f /epan/dissectors/packet-ssl-utils.c | |
parent | 5851b8aa40a146f7cdf5314eece4e55867131b00 (diff) |
fix a number of warnings, and type of ssl_decrypt_record when HAVE_LIBGNUTLS is not defined.
svn path=/trunk/; revision=21371
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
-rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 5db2dd19d2..aa0f008556 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -47,8 +47,6 @@ struct _SslDecompress { }; -static gint ver_major, ver_minor, ver_patch; - void ssl_data_set(StringInfo* str, const guchar* data, guint len) { @@ -58,6 +56,8 @@ ssl_data_set(StringInfo* str, const guchar* data, guint len) #ifdef HAVE_LIBGNUTLS +static gint ver_major, ver_minor, ver_patch; + /* hmac abstraction layer */ #define SSL_HMAC gcry_md_hd_t @@ -676,11 +676,11 @@ ssl_create_flow(void) } /* memory allocations functions for zlib intialization */ -static void* ssl_zalloc(void* opaque, unsigned int no, unsigned int size) +static void* ssl_zalloc(void* opaque _U_, unsigned int no, unsigned int size) { return g_malloc0(no*size); } -static void ssl_zfree(void* opaque, void* address) +static void ssl_zfree(void* opaque _U_, void* address) { g_free(address); } @@ -1255,12 +1255,12 @@ ssl_decrypt_record(SslDecryptSession*ssl,SslDecoder* decoder, gint ct, } /* And the MAC */ - worklen-=decoder->cipher_suite->dig_len; - if (worklen < 0) + if (decoder->cipher_suite->dig_len > worklen) { ssl_debug_printf("ssl_decrypt_record wrong record len/padding outlen %d\n work %d\n",*outl, worklen); return -1; } + worklen-=decoder->cipher_suite->dig_len; mac = out_str->data + worklen; /* if TLS 1.1 we use the transmitted IV and remove it after (to not modify dissector in others parts)*/ @@ -1515,7 +1515,7 @@ ssl_decrypt_pre_master_secret(SslDecryptSession* ssl_session, int ssl_decrypt_record(SslDecryptSession*ssl, SslDecoder* decoder, gint ct, - const guchar* in, gint inl, guchar*out, gint* outl) + const guchar* in, guint inl, StringInfo* comp_str _U_, StringInfo* out, guint* outl) { ssl_debug_printf("ssl_decrypt_record: impossible without gnutls. ssl %p" "decoder %p ct %d, in %p inl %d out %p outl %p\n", ssl, decoder, ct, @@ -1524,7 +1524,7 @@ ssl_decrypt_record(SslDecryptSession*ssl, SslDecoder* decoder, gint ct, } gint -ssl_cipher_setiv(SSL_CIPHER_CTX *cipher, guchar* iv, gint iv_len) +ssl_cipher_setiv(SSL_CIPHER_CTX *cipher _U_, guchar* iv _U_, gint iv_len _U_) { ssl_debug_printf("ssl_cipher_setiv: impossible without glutls.\n"); return 0; |