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 /epan/dissectors/packet-pkcs12.c | |
| 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 'epan/dissectors/packet-pkcs12.c')
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 1d98461022..78af685fd7 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -47,9 +47,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" @@ -140,7 +138,7 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 78 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 76 "../../asn1/pkcs12/packet-pkcs12-template.c" /* Initialize the subtree pointers */ @@ -168,7 +166,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 81 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 79 "../../asn1/pkcs12/packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -1152,7 +1150,7 @@ static int dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 389 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 387 "../../asn1/pkcs12/packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1441,7 +1439,7 @@ void proto_register_pkcs12(void) { "AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 461 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 459 "../../asn1/pkcs12/packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1472,7 +1470,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 467 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 465 "../../asn1/pkcs12/packet-pkcs12-template.c" }; static ei_register_info ei[] = { { &ei_pkcs12_octet_string_expected, { "pkcs12.octet_string_expected", PI_PROTOCOL, PI_WARN, "BER Error: OCTET STRING expected", EXPFILL }}, @@ -1540,7 +1538,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 506 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 504 "../../asn1/pkcs12/packet-pkcs12-template.c" register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); |