diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2015-10-30 17:45:53 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-02 11:42:00 +0000 |
| commit | 1c5b3c378321267e86aa4154c3d907a1088f6949 (patch) | |
| tree | 70cc947e516e6da857c4fa6129cd959a46b210e0 /asn1 | |
| parent | 7f10520d0442a51fc9747d702b144592b4915964 (diff) | |
wsgcrypt.h checks internally if we HAVE_LIBGCRYPT
we can #include <wsutils/wsgcrypt.h> without doing the check ourselves
Change-Id: I248431bdb6cfa1bd85b794ec04ce1e4fcd3a7d2d
Reviewed-on: https://code.wireshark.org/review/11483
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 2 | ||||
| -rw-r--r-- | asn1/snmp/packet-snmp-template.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index d6a80dc586..bcdd6202a0 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -39,9 +39,7 @@ #include "packet-x509if.h" #include "packet-cms.h" -#ifdef HAVE_LIBGCRYPT #include <wsutil/wsgcrypt.h> -#endif #define PNAME "PKCS#12: Personal Information Exchange" #define PSNAME "PKCS12" diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index c0b97d7856..a94dffdf35 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -67,9 +67,7 @@ #include "packet-ber.h" #include "packet-snmp.h" -#ifdef HAVE_LIBGCRYPT #include <wsutil/wsgcrypt.h> -#endif /* Take a pointer that may be null and return a pointer that's not null by turning null pointers into pointers to the above null string, |