forked from osmocom/wireshark
Use _U_ for unused arguments.
svn path=/trunk/; revision=41478
This commit is contained in:
parent
42df48aab0
commit
1301b98e25
|
@ -757,10 +757,10 @@ keylookup(guint8 *keybuff, guint8 keyid)
|
||||||
* \param decrypt TRUE if packet is to be authenticated and decrypted; FALSE if authentication only is requested
|
* \param decrypt TRUE if packet is to be authenticated and decrypted; FALSE if authentication only is requested
|
||||||
* \returns TRUE if the requested operation was successful; otherwise FALSE
|
* \returns TRUE if the requested operation was successful; otherwise FALSE
|
||||||
*/
|
*/
|
||||||
|
#ifdef HAVE_LIBGCRYPT
|
||||||
static gboolean
|
static gboolean
|
||||||
decrypt_packet(guchar *buffer, guint32 length, gboolean decrypt)
|
decrypt_packet(guchar *buffer, guint32 length, gboolean decrypt)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_LIBGCRYPT
|
|
||||||
#define CANONBUFFSIZE 300U
|
#define CANONBUFFSIZE 300U
|
||||||
guchar canonbuff[CANONBUFFSIZE];
|
guchar canonbuff[CANONBUFFSIZE];
|
||||||
guint8 c1222_key[EAX_SIZEOF_KEY];
|
guint8 c1222_key[EAX_SIZEOF_KEY];
|
||||||
|
@ -796,14 +796,14 @@ decrypt_packet(guchar *buffer, guint32 length, gboolean decrypt)
|
||||||
decrypt ? EAX_MODE_CIPHERTEXT_AUTH : EAX_MODE_CLEARTEXT_AUTH);
|
decrypt ? EAX_MODE_CIPHERTEXT_AUTH : EAX_MODE_CLEARTEXT_AUTH);
|
||||||
}
|
}
|
||||||
return status;
|
return status;
|
||||||
#else /* HAVE_LIBCRYPT */
|
|
||||||
/* these are to silence compiler unreferenced variable warnings */
|
|
||||||
buffer=buffer;
|
|
||||||
length=length;
|
|
||||||
decrypt=decrypt;
|
|
||||||
return FALSE;
|
|
||||||
#endif /* HAVE_LIBGCRYPT */
|
|
||||||
}
|
}
|
||||||
|
#else /* HAVE_LIBCRYPT */
|
||||||
|
static gboolean
|
||||||
|
decrypt_packet(guchar *buffer _U_, guint32 length _U_, gboolean decrypt _U_)
|
||||||
|
{
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
#endif /* HAVE_LIBGCRYPT */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks to make sure that a complete, valid BER-encoded length is in the buffer.
|
* Checks to make sure that a complete, valid BER-encoded length is in the buffer.
|
||||||
|
|
|
@ -802,10 +802,10 @@ keylookup(guint8 *keybuff, guint8 keyid)
|
||||||
* \param decrypt TRUE if packet is to be authenticated and decrypted; FALSE if authentication only is requested
|
* \param decrypt TRUE if packet is to be authenticated and decrypted; FALSE if authentication only is requested
|
||||||
* \returns TRUE if the requested operation was successful; otherwise FALSE
|
* \returns TRUE if the requested operation was successful; otherwise FALSE
|
||||||
*/
|
*/
|
||||||
|
#ifdef HAVE_LIBGCRYPT
|
||||||
static gboolean
|
static gboolean
|
||||||
decrypt_packet(guchar *buffer, guint32 length, gboolean decrypt)
|
decrypt_packet(guchar *buffer, guint32 length, gboolean decrypt)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_LIBGCRYPT
|
|
||||||
#define CANONBUFFSIZE 300U
|
#define CANONBUFFSIZE 300U
|
||||||
guchar canonbuff[CANONBUFFSIZE];
|
guchar canonbuff[CANONBUFFSIZE];
|
||||||
guint8 c1222_key[EAX_SIZEOF_KEY];
|
guint8 c1222_key[EAX_SIZEOF_KEY];
|
||||||
|
@ -841,14 +841,14 @@ decrypt_packet(guchar *buffer, guint32 length, gboolean decrypt)
|
||||||
decrypt ? EAX_MODE_CIPHERTEXT_AUTH : EAX_MODE_CLEARTEXT_AUTH);
|
decrypt ? EAX_MODE_CIPHERTEXT_AUTH : EAX_MODE_CLEARTEXT_AUTH);
|
||||||
}
|
}
|
||||||
return status;
|
return status;
|
||||||
#else /* HAVE_LIBCRYPT */
|
|
||||||
/* these are to silence compiler unreferenced variable warnings */
|
|
||||||
buffer=buffer;
|
|
||||||
length=length;
|
|
||||||
decrypt=decrypt;
|
|
||||||
return FALSE;
|
|
||||||
#endif /* HAVE_LIBGCRYPT */
|
|
||||||
}
|
}
|
||||||
|
#else /* HAVE_LIBCRYPT */
|
||||||
|
static gboolean
|
||||||
|
decrypt_packet(guchar *buffer _U_, guint32 length _U_, gboolean decrypt _U_)
|
||||||
|
{
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
#endif /* HAVE_LIBGCRYPT */
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks to make sure that a complete, valid BER-encoded length is in the buffer.
|
* Checks to make sure that a complete, valid BER-encoded length is in the buffer.
|
||||||
|
|
Loading…
Reference in New Issue