diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-04-12 14:53:48 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-04-12 14:53:48 +0000 |
| commit | 3098afe6ade2d9a1c4338e129e9f667f40533119 (patch) | |
| tree | 81acf73dc3c6be86e698e057bb02f6215a074750 /asn1 | |
| parent | 74766c736ad68c800f7d997f591dc29093d2cca0 (diff) | |
| download | wireshark-3098afe6ade2d9a1c4338e129e9f667f40533119.tar.gz | |
From Martin Peylo (bug 2245):
I'm providing a patch for the asn2wrs cmp.cnf file showing the types of the
PKIBody and PKIStatus in the info column.
svn path=/trunk/; revision=24935
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/pkixcmp/CMP.asn | 1 | ||||
| -rw-r--r-- | asn1/pkixcmp/cmp.cnf | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/asn1/pkixcmp/CMP.asn b/asn1/pkixcmp/CMP.asn index 79d16be9eb..94e80dde5e 100644 --- a/asn1/pkixcmp/CMP.asn +++ b/asn1/pkixcmp/CMP.asn @@ -147,6 +147,7 @@ cp [3] CertRepMessage, --Certification Response -- p10cr [4] CertificationRequest, --imported from [PKCS10] + p10cr [4] NULL, -- added for Wireshark to avoid miscounting of the branch_taken popdecc [5] POPODecKeyChallContent, --pop Challenge popdecr [6] POPODecKeyRespContent, --pop Response kur [7] CertReqMessages, --Key Update Request diff --git a/asn1/pkixcmp/cmp.cnf b/asn1/pkixcmp/cmp.cnf index 5a1f1cc6c5..bf3ec93eb5 100644 --- a/asn1/pkixcmp/cmp.cnf +++ b/asn1/pkixcmp/cmp.cnf @@ -89,4 +89,28 @@ RevAnnContent/status pkistatus #.FN_BODY InfoTypeAndValue/infoValue offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); +#.FN_PARS PKIBody + VAL_PTR = &branch_taken + +#.FN_BODY PKIBody + gint branch_taken; + + %(DEFAULT_BODY)s + + if (check_col(actx->pinfo->cinfo, COL_INFO)) { + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Body=%%s", val_to_str(branch_taken, cmp_PKIBody_vals, "unknown")); + } + +#.FN_PARS PKIStatus + VAL_PTR = &value + +#.FN_BODY PKIStatus + guint32 value; + + %(DEFAULT_BODY)s + + if (check_col(actx->pinfo->cinfo, COL_INFO)) { + col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Status=%%s", val_to_str(value, cmp_PKIStatus_vals, "unknown")); + } + #.END_OF_CNF |