diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-01-04 10:42:15 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-01-04 11:31:40 +0000 |
| commit | f02d9b46137aa9cf309dc40092917d5ac2f54c0c (patch) | |
| tree | c68c541f0a49cfc377d77d81c976eb47bc6ebe44 | |
| parent | 9bf97f9886433b3d99dadd18059a3197ed2e4b01 (diff) | |
C12.22: fix compilation without Libgcrypt
Change-Id: I9ef842b4ed543cfbd199e49496bc01a09f71404b
Reviewed-on: https://code.wireshark.org/review/13039
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | asn1/c1222/packet-c1222-template.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-c1222.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c index d37f7c946d..fae65c0714 100644 --- a/asn1/c1222/packet-c1222-template.c +++ b/asn1/c1222/packet-c1222-template.c @@ -923,7 +923,9 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ gint len2; int cmd_err; gboolean ind; +#ifdef HAVE_LIBGCRYPT guchar *buffer; +#endif tvbuff_t *epsem_buffer = NULL; gboolean crypto_good = FALSE; gboolean crypto_bad = FALSE; @@ -967,9 +969,9 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ len2 = tvb_reported_length_remaining(tvb, offset); if (len2 <= 0) return offset; - buffer = (guchar *)tvb_memdup(wmem_packet_scope(), tvb, offset, len2); epsem_buffer = tvb_new_subset_remaining(tvb, offset); #ifdef HAVE_LIBGCRYPT + buffer = (guchar *)tvb_memdup(wmem_packet_scope(), tvb, offset, len2); if (c1222_decrypt) { if (!decrypt_packet(buffer, len2, FALSE)) { crypto_bad = TRUE; diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 7f47d12c14..defc0a2e83 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -974,7 +974,9 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ gint len2; int cmd_err; gboolean ind; +#ifdef HAVE_LIBGCRYPT guchar *buffer; +#endif tvbuff_t *epsem_buffer = NULL; gboolean crypto_good = FALSE; gboolean crypto_bad = FALSE; @@ -1018,9 +1020,9 @@ dissect_epsem(tvbuff_t *tvb, int offset, guint32 len, packet_info *pinfo, proto_ len2 = tvb_reported_length_remaining(tvb, offset); if (len2 <= 0) return offset; - buffer = (guchar *)tvb_memdup(wmem_packet_scope(), tvb, offset, len2); epsem_buffer = tvb_new_subset_remaining(tvb, offset); #ifdef HAVE_LIBGCRYPT + buffer = (guchar *)tvb_memdup(wmem_packet_scope(), tvb, offset, len2); if (c1222_decrypt) { if (!decrypt_packet(buffer, len2, FALSE)) { crypto_bad = TRUE; @@ -1566,7 +1568,7 @@ static int dissect_MESSAGE_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_ /*--- End of included file: packet-c1222-fn.c ---*/ -#line 1048 "../../asn1/c1222/packet-c1222-template.c" +#line 1050 "../../asn1/c1222/packet-c1222-template.c" /** * Dissects a a full (reassembled) C12.22 message. @@ -1952,7 +1954,7 @@ void proto_register_c1222(void) { "OCTET_STRING_SIZE_CONSTR002", HFILL }}, /*--- End of included file: packet-c1222-hfarr.c ---*/ -#line 1329 "../../asn1/c1222/packet-c1222-template.c" +#line 1331 "../../asn1/c1222/packet-c1222-template.c" }; /* List of subtrees */ @@ -1975,7 +1977,7 @@ void proto_register_c1222(void) { &ett_c1222_Calling_authentication_value_c1221_U, /*--- End of included file: packet-c1222-ettarr.c ---*/ -#line 1339 "../../asn1/c1222/packet-c1222-template.c" +#line 1341 "../../asn1/c1222/packet-c1222-template.c" }; static ei_register_info ei[] = { |