diff options
Diffstat (limited to 'epan/dissectors/asn1/x509sat')
| -rw-r--r-- | epan/dissectors/asn1/x509sat/packet-x509sat-template.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x509sat/x509sat.cnf | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/epan/dissectors/asn1/x509sat/packet-x509sat-template.c b/epan/dissectors/asn1/x509sat/packet-x509sat-template.c index c32c5b08..41e9b402 100644 --- a/epan/dissectors/asn1/x509sat/packet-x509sat-template.c +++ b/epan/dissectors/asn1/x509sat/packet-x509sat-template.c @@ -16,6 +16,7 @@ #include <epan/asn1.h> #include <epan/proto_data.h> #include <epan/strutil.h> +#include <wsutil/array.h> #include "packet-ber.h" #include "packet-p1.h" @@ -30,7 +31,7 @@ void proto_register_x509sat(void); void proto_reg_handoff_x509sat(void); /* Initialize the protocol and registered fields */ -static int proto_x509sat = -1; +static int proto_x509sat; #include "packet-x509sat-hf.c" /* Initialize the subtree pointers */ @@ -48,7 +49,7 @@ void proto_register_x509sat(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { #include "packet-x509sat-ettarr.c" }; diff --git a/epan/dissectors/asn1/x509sat/x509sat.cnf b/epan/dissectors/asn1/x509sat/x509sat.cnf index e139e092..8195b9f8 100644 --- a/epan/dissectors/asn1/x509sat/x509sat.cnf +++ b/epan/dissectors/asn1/x509sat/x509sat.cnf @@ -183,6 +183,8 @@ DirectoryString B "2.5.4.65" "id-at-pseudonym" ObjectIdentifier B "2.5.4.66" "id-at-communuicationsService" ObjectIdentifier B "2.5.4.67" "id-at-communuicationsNetwork" +DirectoryString B "2.5.4.97" "id-at-organizationIdentifier" + SyntaxNumericString B "2.5.13.8" "id-mr-numericStringMatch" CaseIgnoreListMatch B "2.5.13.11" "id-mr-caseIgnoreListMatch" BitString B "2.5.13.16" "id-mr-bitStringMatch" @@ -376,27 +378,27 @@ XDayOf/fifth fifth_dayof #.FN_BODY SyntaxUTCTime char *outstr, *newstr; - guint32 tvblen; + uint32_t tvblen; /* the 2-digit year can only be in the range 1950..2049 https://tools.ietf.org/html/rfc5280#section-4.1.2.5.1 */ offset = dissect_ber_UTCTime(implicit_tag, actx, tree, tvb, offset, hf_index, &outstr, &tvblen); - if (hf_index >= 0 && outstr) { + if (hf_index > 0 && outstr) { newstr = wmem_strconcat(actx->pinfo->pool, outstr[0] < '5' ? "20": "19", outstr, NULL); proto_tree_add_string(tree, hf_index, tvb, offset - tvblen, tvblen, newstr); } #.FN_BODY GUID - gint8 ber_class; + int8_t ber_class; bool pc; - gint32 tag; - guint32 len; + int32_t tag; + uint32_t len; e_guid_t uuid; if(!implicit_tag){ offset=dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &ber_class, &pc, &tag); offset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL); } else { - gint32 remaining=tvb_reported_length_remaining(tvb, offset); + int32_t remaining=tvb_reported_length_remaining(tvb, offset); len=remaining>0 ? remaining : 0; } |