diff options
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-ber.c | 18 | ||||
-rw-r--r-- | epan/dissectors/packet-ber.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-cmip.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-cmip.h | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-cms.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ess.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-kerberos.c | 26 | ||||
-rw-r--r-- | epan/dissectors/packet-ocsp.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-pkixqualified.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-pkixtsp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-x509af.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-x509ce.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-x509sat.c | 2 |
13 files changed, 49 insertions, 43 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index df4303fc51..289b93c4e0 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -1371,7 +1371,7 @@ int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *pa } int -dissect_ber_generalized_time(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id) +dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id) { char str[32]; const guint8 *tmpstr; @@ -1381,17 +1381,23 @@ dissect_ber_generalized_time(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb guint32 len; int end_offset; - offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag); - offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL); - end_offset=offset+len; + if(!implicit_tag){ + offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag); + offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL); + end_offset=offset+len; - /* sanity check. we only handle universal/generalized time */ - if( (class!=BER_CLASS_UNI) + /* sanity check. we only handle universal/generalized time */ + if( (class!=BER_CLASS_UNI) ||(tag!=BER_UNI_TAG_GeneralizedTime)){ proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: GeneralizedTime expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag); return end_offset; end_offset=offset+len; + } + } else { + len=tvb_length_remaining(tvb,offset); + end_offset=offset+len; } + tmpstr=tvb_get_ptr(tvb, offset, len); snprintf(str, 31, "%.4s-%.2s-%.2s %.2s:%.2s:%.2s (%.1s)", diff --git a/epan/dissectors/packet-ber.h b/epan/dissectors/packet-ber.h index 4e79d3dcfa..59226cdcb8 100644 --- a/epan/dissectors/packet-ber.h +++ b/epan/dissectors/packet-ber.h @@ -139,7 +139,7 @@ extern int dissect_ber_sequence_of(gboolean implicit_tag, packet_info *pinfo, pr extern int dissect_ber_set_of(gboolean implicit_tag, packet_info *pinfo, proto_tree *parent_tree, tvbuff_t *tvb, int offset, const ber_sequence *seq, gint hf_id, gint ett_id); -extern int dissect_ber_generalized_time(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id); +extern int dissect_ber_GeneralizedTime(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id); typedef struct _asn_namedbit { guint32 bit; diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index a3f21e796d..2f8c62e8a0 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-cmip.c */ -/* ../../tools/asn2eth.py -X -b -k -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */ +/* ../../tools/asn2eth.py -X -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */ /* Input file: packet-cmip-template.c */ @@ -490,7 +490,7 @@ static int dissect_referenceObjectInstance(packet_info *pinfo, proto_tree *tree, static int dissect_cmip_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index); + offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -2829,7 +2829,7 @@ void proto_register_cmip(void) { "ObjectClass/oclocalForm", HFILL }}, { &hf_cmip_distinguishedName, { "distinguishedName", "cmip.distinguishedName", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "ObjectInstance/distinguishedName", HFILL }}, { &hf_cmip_nonSpecificForm, { "nonSpecificForm", "cmip.nonSpecificForm", @@ -2837,7 +2837,7 @@ void proto_register_cmip(void) { "ObjectInstance/nonSpecificForm", HFILL }}, { &hf_cmip_localDistinguishedName, { "localDistinguishedName", "cmip.localDistinguishedName", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "ObjectInstance/localDistinguishedName", HFILL }}, { &hf_cmip_globalForm, { "globalForm", "cmip.globalForm", diff --git a/epan/dissectors/packet-cmip.h b/epan/dissectors/packet-cmip.h index 6b39f83883..e52f74b47d 100644 --- a/epan/dissectors/packet-cmip.h +++ b/epan/dissectors/packet-cmip.h @@ -1,7 +1,7 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ /* ./packet-cmip.h */ -/* ../../tools/asn2eth.py -X -b -k -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */ +/* ../../tools/asn2eth.py -X -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn */ /* Input file: packet-cmip-template.h */ diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index 3ae046e188..ee0ce649e5 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -850,7 +850,7 @@ static int dissect_ukm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int static int dissect_cms_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index); + offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c index d55966f1f5..52f7f59194 100644 --- a/epan/dissectors/packet-ess.c +++ b/epan/dissectors/packet-ess.c @@ -503,7 +503,7 @@ static int dissect_mailListIdentifier(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_ess_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index); + offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -760,7 +760,7 @@ void proto_register_ess(void) { "ReceiptRequest/receiptsTo", HFILL }}, { &hf_ess_receiptsTo_item, { "Item", "ess.receiptsTo_item", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "ReceiptRequest/receiptsTo/_item", HFILL }}, { &hf_ess_allOrFirstTier, { "allOrFirstTier", "ess.allOrFirstTier", @@ -772,7 +772,7 @@ void proto_register_ess(void) { "ReceiptsFrom/receiptList", HFILL }}, { &hf_ess_receiptList_item, { "Item", "ess.receiptList_item", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "ReceiptsFrom/receiptList/_item", HFILL }}, { &hf_ess_version, { "version", "ess.version", @@ -844,7 +844,7 @@ void proto_register_ess(void) { "MLReceiptPolicy/insteadOf", HFILL }}, { &hf_ess_insteadOf_item, { "Item", "ess.insteadOf_item", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "MLReceiptPolicy/insteadOf/_item", HFILL }}, { &hf_ess_inAdditionTo, { "inAdditionTo", "ess.inAdditionTo", @@ -852,7 +852,7 @@ void proto_register_ess(void) { "MLReceiptPolicy/inAdditionTo", HFILL }}, { &hf_ess_inAdditionTo_item, { "Item", "ess.inAdditionTo_item", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "MLReceiptPolicy/inAdditionTo/_item", HFILL }}, { &hf_ess_certs, { "certs", "ess.certs", @@ -880,7 +880,7 @@ void proto_register_ess(void) { "ESSCertID/issuerSerial", HFILL }}, { &hf_ess_issuer, { "issuer", "ess.issuer", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "IssuerSerial/issuer", HFILL }}, { &hf_ess_serialNumber, { "serialNumber", "ess.serialNumber", diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 1c20a86542..7f7eb49ef4 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -1463,14 +1463,14 @@ dissect_krb5_KDCOptions(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int static int dissect_krb5_rtime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_rtime); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_rtime); return offset; } int dissect_krb5_ctime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_ctime); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_ctime); return offset; } static int @@ -1483,7 +1483,7 @@ dissect_krb5_cusec(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs static int dissect_krb5_stime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_stime); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_stime); return offset; } static int @@ -1512,13 +1512,13 @@ dissect_krb5_error_code(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int static int dissect_krb5_till(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_till); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_till); return offset; } static int dissect_krb5_from(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_from); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_from); return offset; } @@ -1885,7 +1885,7 @@ dissect_krb5_pausec(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int off static int dissect_krb5_patimestamp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_patimestamp); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_patimestamp); return offset; } static const ber_sequence PA_ENC_TS_ENC_sequence[] = { @@ -2577,25 +2577,25 @@ dissect_krb5_transited(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int static int dissect_krb5_authtime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_authtime); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_authtime); return offset; } static int dissect_krb5_starttime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_starttime); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_starttime); return offset; } static int dissect_krb5_endtime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_endtime); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_endtime); return offset; } static int dissect_krb5_renew_till(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_renew_till); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_renew_till); return offset; } @@ -2703,7 +2703,7 @@ dissect_krb5_lr_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int of static int dissect_krb5_lr_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_lr_time); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_lr_time); return offset; } @@ -2736,7 +2736,7 @@ dissect_krb5_LastReq_sequence_of(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_krb5_key_expiration(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_key_expire); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_key_expire); return offset; } @@ -2920,7 +2920,7 @@ dissect_krb5_SAFE_BODY_user_data(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_krb5_SAFE_BODY_timestamp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) { - offset=dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_krb_SAFE_BODY_timestamp); + offset=dissect_ber_GeneralizedTime(FALSE, pinfo, tree, tvb, offset, hf_krb_SAFE_BODY_timestamp); return offset; } diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index b1b1a2e812..4922937f90 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -476,7 +476,7 @@ static int dissect_responderID(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_ocsp_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index); + offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -641,7 +641,7 @@ dissect_ocsp_BasicOCSPResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int off static int dissect_ocsp_ArchiveCutoff(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index); + offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } @@ -854,7 +854,7 @@ void proto_register_ocsp(void) { "TBSRequest/requestList/_item", HFILL }}, { &hf_ocsp_requestExtensions, { "requestExtensions", "ocsp.requestExtensions", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "TBSRequest/requestExtensions", HFILL }}, { &hf_ocsp_signatureAlgorithm, { "signatureAlgorithm", "ocsp.signatureAlgorithm", @@ -878,7 +878,7 @@ void proto_register_ocsp(void) { "Request/reqCert", HFILL }}, { &hf_ocsp_singleRequestExtensions, { "singleRequestExtensions", "ocsp.singleRequestExtensions", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "Request/singleRequestExtensions", HFILL }}, { &hf_ocsp_hashAlgorithm, { "hashAlgorithm", "ocsp.hashAlgorithm", @@ -934,7 +934,7 @@ void proto_register_ocsp(void) { "ResponseData/responses/_item", HFILL }}, { &hf_ocsp_responseExtensions, { "responseExtensions", "ocsp.responseExtensions", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "ResponseData/responseExtensions", HFILL }}, { &hf_ocsp_byName, { "byName", "ocsp.byName", @@ -962,7 +962,7 @@ void proto_register_ocsp(void) { "SingleResponse/nextUpdate", HFILL }}, { &hf_ocsp_singleExtensions, { "singleExtensions", "ocsp.singleExtensions", - FT_UINT32, BASE_DEC, NULL, 0, + FT_NONE, BASE_NONE, NULL, 0, "SingleResponse/singleExtensions", HFILL }}, { &hf_ocsp_good, { "good", "ocsp.good", diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c index 7e52413af8..9fddebf7a0 100644 --- a/epan/dissectors/packet-pkixqualified.c +++ b/epan/dissectors/packet-pkixqualified.c @@ -111,7 +111,7 @@ static int dissect_NameRegistrationAuthorities_item(packet_info *pinfo, proto_tr static int dissect_pkixqualified_Generalizedtime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index); + offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 84f6338f9e..96f72a7fad 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -341,7 +341,7 @@ static int dissect_tst_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_pkixtsp_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index); + offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index a58f86c7b5..2f7e97089c 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -320,7 +320,7 @@ static int dissect_utcTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, static int dissect_x509af_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index); + offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c index e4ff90f446..3f918750f4 100644 --- a/epan/dissectors/packet-x509ce.c +++ b/epan/dissectors/packet-x509ce.c @@ -543,7 +543,7 @@ dissect_x509ce_KeyPurposeIDs(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse static int dissect_x509ce_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index); + offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index 543c2d49b8..8c902548e0 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -872,7 +872,7 @@ dissect_x509sat_LanguageContextSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, static int dissect_x509sat_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { - offset = dissect_ber_generalized_time(pinfo, tree, tvb, offset, hf_index); + offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index); return offset; } |