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

Fix compilation when we don't HAVE_LIBGCRYPT 

svn path=/trunk/; revision=52527
This commit is contained in:
Jeff Morriss 2013-10-11 00:42:02 +00:00
parent 64cc800644
commit 545455db1c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asn1/c1222/c1222.cnf
View File

@ -18,7 +18,7 @@ MESSAGE
#.FIELD_RENAME
#.TYPE_ATTR
#.TYPE_ATTR
Calling-authentication-value-c1222/_untag/iv-element BLURB="c1222.iv-element"
Calling-authentication-value-c1222/_untag/key-id-element BLURB = "c1222.key-id-element"
AP-invocation-id TYPE=FT_UINT32
@ -32,7 +32,7 @@ AE-qualifier TYPE=FT_UINT32
proto_item *tf = NULL;
proto_tree *epsem_tree = NULL;
FILL_START;
/* get Tag and Length */
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &end_device_class, &pc, &tag);
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
@ -99,6 +99,8 @@ AE-qualifier TYPE=FT_UINT32
FILL_TABLE(iv_element);
#.FN_BODY MESSAGE
/**/#ifdef HAVE_LIBGCRYPT
clear_canon();
/**/#endif
%(DEFAULT_BODY)s
#.END

4
epan/dissectors/packet-c1222.c
View File

@ -1500,7 +1500,7 @@ dissect_c1222_User_information(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
proto_item *tf = NULL;
proto_tree *epsem_tree = NULL;
FILL_START;
/* get Tag and Length */
offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &end_device_class, &pc, &tag);
offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind);
@ -1548,7 +1548,9 @@ dissect_c1222_MESSAGE_U(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
static int
dissect_c1222_MESSAGE(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 102 "../../asn1/c1222/c1222.cnf"
/**/#ifdef HAVE_LIBGCRYPT
clear_canon();
/**/#endif
offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
hf_index, BER_CLASS_APP, 0, TRUE, dissect_c1222_MESSAGE_U);