osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Tobias Witek (bug 3496): 

The patch puts the function declarations for zbee_sec_ccm_decrypt() and
zbee_sec_key_hash() into a #ifdef HAVE_LIBGCRYPT guardian to avoid gcc from
complaining about functions that are declared as 'static' but never defined.

It additionally puts the function zbee_sec_make_nonce() (and its declaration)
into a #ifdef HAVE_LIBGCRYPT guardian to avoid gcc from complaining about a
defined but unused function, if libgcrypt is not used.

svn path=/trunk/; revision=28513
This commit is contained in:
Stig Bjørlykke 2009-05-28 08:38:49 +00:00
parent 932c696498
commit 385d0e165f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-zbee-security.c
View File

@ -53,10 +53,12 @@
#include "packet-zbee-security.h"
/* Helper Functions */
static void zbee_security_parse_prefs(void);
#ifdef HAVE_LIBGCRYPT
static gboolean zbee_sec_ccm_decrypt(const gchar *, const gchar *, const gchar *, const gchar *, gchar *, guint, guint, guint);
static void zbee_sec_make_nonce (guint8 *, zbee_security_packet *);
static guint8 * zbee_sec_key_hash(guint8 *, guint8, packet_info *);
static void zbee_sec_make_nonce (guint8 *, zbee_security_packet *);
#endif
static void zbee_security_parse_prefs(void);
/* Field pointers. */
static int hf_zbee_sec_level = -1;
@ -597,6 +599,7 @@ decrypt_failed:
} /* dissect_zbee_secure */
#ifdef HAVE_LIBGCRYPT
/*FUNCTION:------------------------------------------------------
* NAME
* zbee_sec_make_nonce
@ -630,6 +633,7 @@ zbee_sec_make_nonce(guint8 *nonce, zbee_security_packet *packet)
/* Next byte is the security control field. */
*(nonce++) = packet->control;
} /* zbee_sec_make_nonce */
#endif
#ifdef HAVE_LIBGCRYPT
/*FUNCTION:------------------------------------------------------