diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-10-11 00:42:02 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2013-10-11 00:42:02 +0000 |
| commit | 545455db1c2472b2d0657e8b543e09df2a9178e4 (patch) | |
| tree | 4d5447a4d16dcbf4bd69eea7101937816e99731e | |
| parent | 64cc800644a90b1e4456042e18e98da1ad8ad666 (diff) | |
Fix compilation when we don't HAVE_LIBGCRYPT
svn path=/trunk/; revision=52527
| -rw-r--r-- | asn1/c1222/c1222.cnf | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-c1222.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/asn1/c1222/c1222.cnf b/asn1/c1222/c1222.cnf index 851f40c3f5..76e54f5127 100644 --- a/asn1/c1222/c1222.cnf +++ b/asn1/c1222/c1222.cnf @@ -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 diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 2b1a9dddb0..ba62edfc3e 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -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); |