diff options
Diffstat (limited to 'epan/dissectors/packet-x509af.c')
| -rw-r--r-- | epan/dissectors/packet-x509af.c | 281 |
1 files changed, 141 insertions, 140 deletions
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index e84d1532..d8e46f3c 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -1,7 +1,7 @@ /* Do not modify this file. Changes will be overwritten. */ /* Generated automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-x509af.c */ -/* asn2wrs.py -b -L -p x509af -c ./x509af.cnf -s ./packet-x509af-template -D . -O ../.. AuthenticationFramework.asn */ +/* asn2wrs.py -b -q -L -p x509af -c ./x509af.cnf -s ./packet-x509af-template -D . -O ../.. AuthenticationFramework.asn */ /* packet-x509af.c * Routines for X.509 Authentication Framework packet dissection @@ -20,6 +20,7 @@ #include <epan/oids.h> #include <epan/asn1.h> #include <epan/strutil.h> +#include <wsutil/array.h> #include "packet-ber.h" #include "packet-x509af.h" @@ -42,121 +43,121 @@ void proto_reg_handoff_x509af(void); static dissector_handle_t pkix_crl_handle; /* Initialize the protocol and registered fields */ -static int proto_x509af = -1; -static int hf_x509af_algorithm_id = -1; -static int hf_x509af_extension_id = -1; -static int hf_x509af_x509af_Certificate_PDU = -1; /* Certificate */ -static int hf_x509af_SubjectPublicKeyInfo_PDU = -1; /* SubjectPublicKeyInfo */ -static int hf_x509af_CertificatePair_PDU = -1; /* CertificatePair */ -static int hf_x509af_CertificateList_PDU = -1; /* CertificateList */ -static int hf_x509af_AttributeCertificate_PDU = -1; /* AttributeCertificate */ -static int hf_x509af_DSS_Params_PDU = -1; /* DSS_Params */ -static int hf_x509af_Userid_PDU = -1; /* Userid */ -static int hf_x509af_signedCertificate = -1; /* T_signedCertificate */ -static int hf_x509af_version = -1; /* Version */ -static int hf_x509af_serialNumber = -1; /* CertificateSerialNumber */ -static int hf_x509af_signature = -1; /* AlgorithmIdentifier */ -static int hf_x509af_issuer = -1; /* Name */ -static int hf_x509af_validity = -1; /* Validity */ -static int hf_x509af_subject = -1; /* SubjectName */ -static int hf_x509af_subjectPublicKeyInfo = -1; /* SubjectPublicKeyInfo */ -static int hf_x509af_issuerUniqueIdentifier = -1; /* UniqueIdentifier */ -static int hf_x509af_subjectUniqueIdentifier = -1; /* UniqueIdentifier */ -static int hf_x509af_extensions = -1; /* Extensions */ -static int hf_x509af_algorithmIdentifier = -1; /* AlgorithmIdentifier */ -static int hf_x509af_encrypted = -1; /* BIT_STRING */ -static int hf_x509af_rdnSequence = -1; /* RDNSequence */ -static int hf_x509af_algorithmId = -1; /* T_algorithmId */ -static int hf_x509af_parameters = -1; /* T_parameters */ -static int hf_x509af_notBefore = -1; /* Time */ -static int hf_x509af_notAfter = -1; /* Time */ -static int hf_x509af_algorithm = -1; /* AlgorithmIdentifier */ -static int hf_x509af_subjectPublicKey = -1; /* T_subjectPublicKey */ -static int hf_x509af_utcTime = -1; /* T_utcTime */ -static int hf_x509af_generalizedTime = -1; /* GeneralizedTime */ -static int hf_x509af_Extensions_item = -1; /* Extension */ -static int hf_x509af_extnId = -1; /* T_extnId */ -static int hf_x509af_critical = -1; /* BOOLEAN */ -static int hf_x509af_extnValue = -1; /* T_extnValue */ -static int hf_x509af_userCertificate = -1; /* Certificate */ -static int hf_x509af_certificationPath = -1; /* ForwardCertificationPath */ -static int hf_x509af_ForwardCertificationPath_item = -1; /* CrossCertificates */ -static int hf_x509af_CrossCertificates_item = -1; /* Certificate */ -static int hf_x509af_theCACertificates = -1; /* SEQUENCE_OF_CertificatePair */ -static int hf_x509af_theCACertificates_item = -1; /* CertificatePair */ -static int hf_x509af_issuedByThisCA = -1; /* Certificate */ -static int hf_x509af_issuedToThisCA = -1; /* Certificate */ -static int hf_x509af_signedCertificateList = -1; /* T_signedCertificateList */ -static int hf_x509af_thisUpdate = -1; /* Time */ -static int hf_x509af_nextUpdate = -1; /* Time */ -static int hf_x509af_revokedCertificates = -1; /* T_revokedCertificates */ -static int hf_x509af_revokedCertificates_item = -1; /* T_revokedCertificates_item */ -static int hf_x509af_revokedUserCertificate = -1; /* CertificateSerialNumber */ -static int hf_x509af_revocationDate = -1; /* Time */ -static int hf_x509af_crlEntryExtensions = -1; /* Extensions */ -static int hf_x509af_crlExtensions = -1; /* Extensions */ -static int hf_x509af_attributeCertificate = -1; /* AttributeCertificate */ -static int hf_x509af_acPath = -1; /* SEQUENCE_OF_ACPathData */ -static int hf_x509af_acPath_item = -1; /* ACPathData */ -static int hf_x509af_certificate = -1; /* Certificate */ -static int hf_x509af_signedAttributeCertificateInfo = -1; /* AttributeCertificateInfo */ -static int hf_x509af_info_subject = -1; /* InfoSubject */ -static int hf_x509af_baseCertificateID = -1; /* IssuerSerial */ -static int hf_x509af_infoSubjectName = -1; /* GeneralNames */ -static int hf_x509af_issuerName = -1; /* GeneralNames */ -static int hf_x509af_attCertValidityPeriod = -1; /* AttCertValidityPeriod */ -static int hf_x509af_attributes = -1; /* SEQUENCE_OF_Attribute */ -static int hf_x509af_attributes_item = -1; /* Attribute */ -static int hf_x509af_issuerUniqueID = -1; /* UniqueIdentifier */ -static int hf_x509af_serial = -1; /* CertificateSerialNumber */ -static int hf_x509af_issuerUID = -1; /* UniqueIdentifier */ -static int hf_x509af_notBeforeTime = -1; /* GeneralizedTime */ -static int hf_x509af_notAfterTime = -1; /* GeneralizedTime */ -static int hf_x509af_assertion_subject = -1; /* AssertionSubject */ -static int hf_x509af_assertionSubjectName = -1; /* SubjectName */ -static int hf_x509af_assertionIssuer = -1; /* Name */ -static int hf_x509af_attCertValidity = -1; /* GeneralizedTime */ -static int hf_x509af_attType = -1; /* SET_OF_AttributeType */ -static int hf_x509af_attType_item = -1; /* AttributeType */ -static int hf_x509af_p = -1; /* INTEGER */ -static int hf_x509af_q = -1; /* INTEGER */ -static int hf_x509af_g = -1; /* INTEGER */ +static int proto_x509af; +static int hf_x509af_algorithm_id; +static int hf_x509af_extension_id; +static int hf_x509af_x509af_Certificate_PDU; /* Certificate */ +static int hf_x509af_SubjectPublicKeyInfo_PDU; /* SubjectPublicKeyInfo */ +static int hf_x509af_CertificatePair_PDU; /* CertificatePair */ +static int hf_x509af_CertificateList_PDU; /* CertificateList */ +static int hf_x509af_AttributeCertificate_PDU; /* AttributeCertificate */ +static int hf_x509af_DSS_Params_PDU; /* DSS_Params */ +static int hf_x509af_Userid_PDU; /* Userid */ +static int hf_x509af_signedCertificate; /* T_signedCertificate */ +static int hf_x509af_version; /* Version */ +static int hf_x509af_serialNumber; /* CertificateSerialNumber */ +static int hf_x509af_signature; /* AlgorithmIdentifier */ +static int hf_x509af_issuer; /* Name */ +static int hf_x509af_validity; /* Validity */ +static int hf_x509af_subject; /* SubjectName */ +static int hf_x509af_subjectPublicKeyInfo; /* SubjectPublicKeyInfo */ +static int hf_x509af_issuerUniqueIdentifier; /* UniqueIdentifier */ +static int hf_x509af_subjectUniqueIdentifier; /* UniqueIdentifier */ +static int hf_x509af_extensions; /* Extensions */ +static int hf_x509af_algorithmIdentifier; /* AlgorithmIdentifier */ +static int hf_x509af_encrypted; /* BIT_STRING */ +static int hf_x509af_rdnSequence; /* RDNSequence */ +static int hf_x509af_algorithmId; /* T_algorithmId */ +static int hf_x509af_parameters; /* T_parameters */ +static int hf_x509af_notBefore; /* Time */ +static int hf_x509af_notAfter; /* Time */ +static int hf_x509af_algorithm; /* AlgorithmIdentifier */ +static int hf_x509af_subjectPublicKey; /* T_subjectPublicKey */ +static int hf_x509af_utcTime; /* T_utcTime */ +static int hf_x509af_generalizedTime; /* GeneralizedTime */ +static int hf_x509af_Extensions_item; /* Extension */ +static int hf_x509af_extnId; /* T_extnId */ +static int hf_x509af_critical; /* BOOLEAN */ +static int hf_x509af_extnValue; /* T_extnValue */ +static int hf_x509af_userCertificate; /* Certificate */ +static int hf_x509af_certificationPath; /* ForwardCertificationPath */ +static int hf_x509af_ForwardCertificationPath_item; /* CrossCertificates */ +static int hf_x509af_CrossCertificates_item; /* Certificate */ +static int hf_x509af_theCACertificates; /* SEQUENCE_OF_CertificatePair */ +static int hf_x509af_theCACertificates_item; /* CertificatePair */ +static int hf_x509af_issuedByThisCA; /* Certificate */ +static int hf_x509af_issuedToThisCA; /* Certificate */ +static int hf_x509af_signedCertificateList; /* T_signedCertificateList */ +static int hf_x509af_thisUpdate; /* Time */ +static int hf_x509af_nextUpdate; /* Time */ +static int hf_x509af_revokedCertificates; /* T_revokedCertificates */ +static int hf_x509af_revokedCertificates_item; /* T_revokedCertificates_item */ +static int hf_x509af_revokedUserCertificate; /* CertificateSerialNumber */ +static int hf_x509af_revocationDate; /* Time */ +static int hf_x509af_crlEntryExtensions; /* Extensions */ +static int hf_x509af_crlExtensions; /* Extensions */ +static int hf_x509af_attributeCertificate; /* AttributeCertificate */ +static int hf_x509af_acPath; /* SEQUENCE_OF_ACPathData */ +static int hf_x509af_acPath_item; /* ACPathData */ +static int hf_x509af_certificate; /* Certificate */ +static int hf_x509af_signedAttributeCertificateInfo; /* AttributeCertificateInfo */ +static int hf_x509af_info_subject; /* InfoSubject */ +static int hf_x509af_baseCertificateID; /* IssuerSerial */ +static int hf_x509af_infoSubjectName; /* GeneralNames */ +static int hf_x509af_issuerName; /* GeneralNames */ +static int hf_x509af_attCertValidityPeriod; /* AttCertValidityPeriod */ +static int hf_x509af_attributes; /* SEQUENCE_OF_Attribute */ +static int hf_x509af_attributes_item; /* Attribute */ +static int hf_x509af_issuerUniqueID; /* UniqueIdentifier */ +static int hf_x509af_serial; /* CertificateSerialNumber */ +static int hf_x509af_issuerUID; /* UniqueIdentifier */ +static int hf_x509af_notBeforeTime; /* GeneralizedTime */ +static int hf_x509af_notAfterTime; /* GeneralizedTime */ +static int hf_x509af_assertion_subject; /* AssertionSubject */ +static int hf_x509af_assertionSubjectName; /* SubjectName */ +static int hf_x509af_assertionIssuer; /* Name */ +static int hf_x509af_attCertValidity; /* GeneralizedTime */ +static int hf_x509af_attType; /* SET_OF_AttributeType */ +static int hf_x509af_attType_item; /* AttributeType */ +static int hf_x509af_p; /* INTEGER */ +static int hf_x509af_q; /* INTEGER */ +static int hf_x509af_g; /* INTEGER */ /* Initialize the subtree pointers */ -static gint ett_pkix_crl = -1; -static gint ett_x509af_Certificate = -1; -static gint ett_x509af_T_signedCertificate = -1; -static gint ett_x509af_SubjectName = -1; -static gint ett_x509af_AlgorithmIdentifier = -1; -static gint ett_x509af_Validity = -1; -static gint ett_x509af_SubjectPublicKeyInfo = -1; -static gint ett_x509af_Time = -1; -static gint ett_x509af_Extensions = -1; -static gint ett_x509af_Extension = -1; -static gint ett_x509af_Certificates = -1; -static gint ett_x509af_ForwardCertificationPath = -1; -static gint ett_x509af_CrossCertificates = -1; -static gint ett_x509af_CertificationPath = -1; -static gint ett_x509af_SEQUENCE_OF_CertificatePair = -1; -static gint ett_x509af_CertificatePair = -1; -static gint ett_x509af_CertificateList = -1; -static gint ett_x509af_T_signedCertificateList = -1; -static gint ett_x509af_T_revokedCertificates = -1; -static gint ett_x509af_T_revokedCertificates_item = -1; -static gint ett_x509af_AttributeCertificationPath = -1; -static gint ett_x509af_SEQUENCE_OF_ACPathData = -1; -static gint ett_x509af_ACPathData = -1; -static gint ett_x509af_AttributeCertificate = -1; -static gint ett_x509af_AttributeCertificateInfo = -1; -static gint ett_x509af_InfoSubject = -1; -static gint ett_x509af_SEQUENCE_OF_Attribute = -1; -static gint ett_x509af_IssuerSerial = -1; -static gint ett_x509af_AttCertValidityPeriod = -1; -static gint ett_x509af_AttributeCertificateAssertion = -1; -static gint ett_x509af_AssertionSubject = -1; -static gint ett_x509af_SET_OF_AttributeType = -1; -static gint ett_x509af_DSS_Params = -1; -static const char *algorithm_id = NULL; +static int ett_pkix_crl; +static int ett_x509af_Certificate; +static int ett_x509af_T_signedCertificate; +static int ett_x509af_SubjectName; +static int ett_x509af_AlgorithmIdentifier; +static int ett_x509af_Validity; +static int ett_x509af_SubjectPublicKeyInfo; +static int ett_x509af_Time; +static int ett_x509af_Extensions; +static int ett_x509af_Extension; +static int ett_x509af_Certificates; +static int ett_x509af_ForwardCertificationPath; +static int ett_x509af_CrossCertificates; +static int ett_x509af_CertificationPath; +static int ett_x509af_SEQUENCE_OF_CertificatePair; +static int ett_x509af_CertificatePair; +static int ett_x509af_CertificateList; +static int ett_x509af_T_signedCertificateList; +static int ett_x509af_T_revokedCertificates; +static int ett_x509af_T_revokedCertificates_item; +static int ett_x509af_AttributeCertificationPath; +static int ett_x509af_SEQUENCE_OF_ACPathData; +static int ett_x509af_ACPathData; +static int ett_x509af_AttributeCertificate; +static int ett_x509af_AttributeCertificateInfo; +static int ett_x509af_InfoSubject; +static int ett_x509af_SEQUENCE_OF_Attribute; +static int ett_x509af_IssuerSerial; +static int ett_x509af_AttCertValidityPeriod; +static int ett_x509af_AttributeCertificateAssertion; +static int ett_x509af_AssertionSubject; +static int ett_x509af_SET_OF_AttributeType; +static int ett_x509af_DSS_Params; +static const char *algorithm_id; static void x509af_export_publickey(tvbuff_t *tvb, asn1_ctx_t *actx, int offset, int len); @@ -243,11 +244,11 @@ dissect_x509af_AlgorithmIdentifier(bool implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_x509af_T_utcTime(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { 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); } @@ -335,16 +336,16 @@ static int dissect_x509af_T_subjectPublicKey(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { tvbuff_t *bs_tvb = NULL; - dissect_ber_bitstring(FALSE, actx, NULL, tvb, offset, + dissect_ber_bitstring(false, actx, NULL, tvb, offset, NULL, 0, hf_index, -1, &bs_tvb); /* See RFC 3279 for possible subjectPublicKey values given an Algorithm ID. * The contents of subjectPublicKey are always explicitly tagged. */ if (bs_tvb && !g_strcmp0(algorithm_id, "1.2.840.113549.1.1.1")) { /* id-rsa */ - offset += dissect_pkcs1_RSAPublicKey(FALSE, bs_tvb, 0, actx, tree, hf_index); + offset += dissect_pkcs1_RSAPublicKey(false, bs_tvb, 0, actx, tree, hf_index); } else { - offset = dissect_ber_bitstring(FALSE, actx, tree, tvb, offset, + offset = dissect_ber_bitstring(false, actx, tree, tvb, offset, NULL, 0, hf_index, -1, NULL); } @@ -401,10 +402,10 @@ dissect_x509af_BOOLEAN(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, static int dissect_x509af_T_extnValue(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - gint8 ber_class; + int8_t ber_class; bool pc, ind; - gint32 tag; - guint32 len; + int32_t tag; + uint32_t len; /* skip past the T and L */ offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &ber_class, &pc, &tag); offset = dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, &ind); @@ -883,50 +884,50 @@ dissect_x509af_Userid(bool implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, int dissect_x509af_Certificate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - offset = dissect_x509af_Certificate(FALSE, tvb, offset, &asn1_ctx, tree, hf_x509af_x509af_Certificate_PDU); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); + offset = dissect_x509af_Certificate(false, tvb, offset, &asn1_ctx, tree, hf_x509af_x509af_Certificate_PDU); return offset; } static int dissect_SubjectPublicKeyInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - offset = dissect_x509af_SubjectPublicKeyInfo(FALSE, tvb, offset, &asn1_ctx, tree, hf_x509af_SubjectPublicKeyInfo_PDU); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); + offset = dissect_x509af_SubjectPublicKeyInfo(false, tvb, offset, &asn1_ctx, tree, hf_x509af_SubjectPublicKeyInfo_PDU); return offset; } static int dissect_CertificatePair_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - offset = dissect_x509af_CertificatePair(FALSE, tvb, offset, &asn1_ctx, tree, hf_x509af_CertificatePair_PDU); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); + offset = dissect_x509af_CertificatePair(false, tvb, offset, &asn1_ctx, tree, hf_x509af_CertificatePair_PDU); return offset; } static int dissect_CertificateList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - offset = dissect_x509af_CertificateList(FALSE, tvb, offset, &asn1_ctx, tree, hf_x509af_CertificateList_PDU); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); + offset = dissect_x509af_CertificateList(false, tvb, offset, &asn1_ctx, tree, hf_x509af_CertificateList_PDU); return offset; } static int dissect_AttributeCertificate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - offset = dissect_x509af_AttributeCertificate(FALSE, tvb, offset, &asn1_ctx, tree, hf_x509af_AttributeCertificate_PDU); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); + offset = dissect_x509af_AttributeCertificate(false, tvb, offset, &asn1_ctx, tree, hf_x509af_AttributeCertificate_PDU); return offset; } static int dissect_DSS_Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - offset = dissect_x509af_DSS_Params(FALSE, tvb, offset, &asn1_ctx, tree, hf_x509af_DSS_Params_PDU); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); + offset = dissect_x509af_DSS_Params(false, tvb, offset, &asn1_ctx, tree, hf_x509af_DSS_Params_PDU); return offset; } static int dissect_Userid_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - offset = dissect_x509af_Userid(FALSE, tvb, offset, &asn1_ctx, tree, hf_x509af_Userid_PDU); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); + offset = dissect_x509af_Userid(false, tvb, offset, &asn1_ctx, tree, hf_x509af_Userid_PDU); return offset; } @@ -940,7 +941,7 @@ x509af_export_publickey(tvbuff_t *tvb _U_, asn1_ctx_t *actx _U_, int offset _U_, #if defined(HAVE_LIBGNUTLS) gnutls_datum_t *subjectPublicKeyInfo = (gnutls_datum_t *)actx->private_data; if (subjectPublicKeyInfo) { - subjectPublicKeyInfo->data = (guchar *) tvb_get_ptr(tvb, offset, len); + subjectPublicKeyInfo->data = (unsigned char *) tvb_get_ptr(tvb, offset, len); subjectPublicKeyInfo->size = len; actx->private_data = NULL; } @@ -957,7 +958,7 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi { proto_tree *tree; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, true, pinfo); col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIX-CRL"); @@ -966,7 +967,7 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, voi tree=proto_tree_add_subtree(parent_tree, tvb, 0, -1, ett_pkix_crl, NULL, "Certificate Revocation List"); - return dissect_x509af_CertificateList(FALSE, tvb, 0, &asn1_ctx, tree, -1); + return dissect_x509af_CertificateList(false, tvb, 0, &asn1_ctx, tree, -1); } static void @@ -1295,7 +1296,7 @@ void proto_register_x509af(void) { }; /* List of subtrees */ - static gint *ett[] = { + static int *ett[] = { &ett_pkix_crl, &ett_x509af_Certificate, &ett_x509af_T_signedCertificate, |