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

include the wsutil/wsgcrypt.h instead of including gcrypt.h directly 

svn path=/trunk/; revision=47802
This commit is contained in:
Martin Kaiser 2013-02-21 18:23:29 +00:00
parent 7126d3a56b
commit 38a73a32f3
15 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/pkcs12/packet-pkcs12-template.c
View File

@ -46,7 +46,7 @@
#endif #endif
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#endif #endif
#define PNAME "PKCS#12: Personal Information Exchange" #define PNAME "PKCS#12: Personal Information Exchange"

2
asn1/snmp/packet-snmp-template.c
View File

@ -79,7 +79,7 @@
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#endif #endif
/* Take a pointer that may be null and return a pointer that's not null /* Take a pointer that may be null and return a pointer that's not null

2
capinfos.c
View File

@ -82,7 +82,7 @@
#include <wsutil/privileges.h> #include <wsutil/privileges.h>
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#include <wsutil/file_util.h> #include <wsutil/file_util.h>
#endif #endif

2
epan/crypt/eax.c
View File

@ -27,7 +27,7 @@
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <string.h> #include <string.h>
/* Use libgcrypt for cipher libraries. */ /* Use libgcrypt for cipher libraries. */
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#include "eax.h" #include "eax.h"
typedef struct { typedef struct {

2
epan/dissectors/packet-dvbci.c
View File

@ -48,7 +48,7 @@
#include "packet-ber.h" #include "packet-ber.h"
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#endif #endif

2
epan/dissectors/packet-ieee802154.c
View File

@ -78,7 +78,7 @@
/* Use libgcrypt for cipher libraries. */ /* Use libgcrypt for cipher libraries. */
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#endif /* HAVE_LIBGCRYPT */ #endif /* HAVE_LIBGCRYPT */
#include "packet-ieee802154.h" #include "packet-ieee802154.h"

2
epan/dissectors/packet-ipsec.c
View File

@ -88,7 +88,7 @@ ADD: Additional generic (non-checked) ICV length of 128, 192 and 256.
/* If you want to be able to decrypt or Check Authentication of ESP packets you MUST define this : */ /* If you want to be able to decrypt or Check Authentication of ESP packets you MUST define this : */
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <epan/uat.h> #include <epan/uat.h>
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#endif /* HAVE_LIBGCRYPT */ #endif /* HAVE_LIBGCRYPT */

2
epan/dissectors/packet-isakmp.c
View File

@ -59,7 +59,7 @@
#include <epan/expert.h> #include <epan/expert.h>
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#include <epan/strutil.h> #include <epan/strutil.h>
#include <epan/uat.h> #include <epan/uat.h>
#endif #endif

2
epan/dissectors/packet-pkcs12.c
View File

@ -54,7 +54,7 @@
#endif #endif
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#endif #endif
#define PNAME "PKCS#12: Personal Information Exchange" #define PNAME "PKCS#12: Personal Information Exchange"

2
epan/dissectors/packet-smb2.c
View File

@ -49,7 +49,7 @@
#include <glib.h> #include <glib.h>
/* Use libgcrypt for cipher libraries. */ /* Use libgcrypt for cipher libraries. */
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#endif /* HAVE_LIBGCRYPT */ #endif /* HAVE_LIBGCRYPT */
static char smb_header_label[] = "SMB2 Header"; static char smb_header_label[] = "SMB2 Header";

2
epan/dissectors/packet-snmp.c
View File

@ -87,7 +87,7 @@
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#endif #endif
/* Take a pointer that may be null and return a pointer that's not null /* Take a pointer that may be null and return a pointer that's not null

2
epan/dissectors/packet-ssl-utils.h
View File

@ -33,7 +33,7 @@
#include <epan/emem.h> #include <epan/emem.h>
#ifdef HAVE_LIBGNUTLS #ifdef HAVE_LIBGNUTLS
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#include <gnutls/x509.h> #include <gnutls/x509.h>
#include <gnutls/pkcs12.h> #include <gnutls/pkcs12.h>

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

@ -39,7 +39,7 @@
* we can do is parse the security header and give up. * we can do is parse the security header and give up.
*/ */
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#endif /* HAVE_LIBGCRYPT */ #endif /* HAVE_LIBGCRYPT */
#include "packet-ieee802154.h" #include "packet-ieee802154.h"

2
epan/epan.c
View File

@ -28,7 +28,7 @@
#endif #endif
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
#endif /* HAVE_LIBGCRYPT */ #endif /* HAVE_LIBGCRYPT */
#ifdef HAVE_LIBGNUTLS #ifdef HAVE_LIBGNUTLS

2
packaging/u3/tools/sysdep.h
View File

@ -50,7 +50,7 @@
#endif #endif
#ifdef HAVE_LIBGCRYPT #ifdef HAVE_LIBGCRYPT
#include <gcrypt.h> #include <wsutil/wsgcrypt.h>
/* md5 /sha abstraction layer */ /* md5 /sha abstraction layer */
#define SHA_CTX gcry_md_hd_t #define SHA_CTX gcry_md_hd_t