forked from osmocom/wireshark
Fix up a bunch of arguments to "dissect_ber_identifier()" to match its
current signature ("class" is a "gint8 *", not a "guint8 *", and "tag"
is a "gint32 *", not a "guint32 *"). Re-generate the dissectors from
the ASN.1 and the .cnf files in the cases where the arguments were fixed
in a .cnf file.
Give some dissectors the right svn:keywords and svn:eol-style settings.
svn path=/trunk/; revision=14885
This commit is contained in:
Guy Harris
parent
9cb86fda9c
commit
34ae8c850f
|
|
@ -34,7 +34,7 @@ ACRQ-apdu/aSO-context-name ACRQ_aSO_context_name
|
|||
gint8 class;
|
||||
gboolean pc, ind_field;
|
||||
gint32 tag;
|
||||
gint32 len1;
|
||||
guint32 len1;
|
||||
|
||||
/* XXX asn2eth can not yet handle tagged assignment so for the
|
||||
* time being just remove this tag manually inside the EXTERNAL
|
||||
|
|
|
|||
|
|
@ -53,9 +53,10 @@ RecipientEncryptedKey/rid rekRid
|
|||
hf_cms_ci_contentType, object_identifier_id);
|
||||
|
||||
#.FN_BODY EncapsulatedContentInfo/eContent
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag, len;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
int pdu_offset = offset;
|
||||
|
||||
/* XXX Do we care about printing out the octet string? */
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@ ServiceLocator B "1.3.6.1.5.5.7.48.1.7" "id-pkix-ocsp-service-locator"
|
|||
hf_ocsp_responseType_id, responseType_id);
|
||||
|
||||
#.FN_BODY ResponseBytes/response
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
/* skip past the T and L */
|
||||
offset = dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@ DomainParameters B "1.2.840.10046.2.1" "dhpublicnumber"
|
|||
hf_pkix1explicit_object_identifier_id, object_identifier_id);
|
||||
|
||||
#.FN_BODY Extension/extnValue
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
/* skip past the T and L */
|
||||
offset = dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
#.FN_BODY SMS-Address/address-value/octet-format
|
||||
char *strp,tmpstr[21];
|
||||
guint32 i, start_offset;
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
static char n2a[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
|
||||
|
||||
|
|
|
|||
|
|
@ -78,9 +78,9 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate
|
|||
hf_x509af_extension_id, extension_id);
|
||||
|
||||
#.FN_BODY Extension/extnValue
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
/* skip past the T and L */
|
||||
offset = dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
|
|
|
|||
|
|
@ -378,10 +378,11 @@ static int dissect_single_ASN1_type(packet_info *pinfo, proto_tree *tree, tvbuff
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_acse_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -444,7 +445,7 @@ dissect_acse_EXTERNAL(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pack
|
|||
gint8 class;
|
||||
gboolean pc, ind_field;
|
||||
gint32 tag;
|
||||
gint32 len1;
|
||||
guint32 len1;
|
||||
|
||||
/* XXX asn2eth can not yet handle tagged assignment so for the
|
||||
* time being just remove this tag manually inside the EXTERNAL
|
||||
|
|
@ -1477,7 +1478,8 @@ static const value_string acse_ABRT_diagnostic_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_acse_ABRT_diagnostic(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -1520,10 +1522,11 @@ static int dissect_user_information_impl(packet_info *pinfo, proto_tree *tree, t
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_acse_Simply_encoded_data(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -267,9 +267,9 @@ get_ber_length_dont_check_len(proto_tree *tree, tvbuff_t *tvb, int offset, guint
|
|||
int dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tree *tree)
|
||||
{
|
||||
int start_offset;
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
proto_item *item=NULL;
|
||||
proto_tree *next_tree=NULL;
|
||||
|
|
@ -538,9 +538,9 @@ dissect_ber_length(packet_info *pinfo _U_, proto_tree *tree, tvbuff_t *tvb, int
|
|||
/* 8.7 Encoding of an octetstring value */
|
||||
int
|
||||
dissect_ber_octet_string(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, tvbuff_t **out_tvb) {
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
int end_offset;
|
||||
proto_item *it;
|
||||
|
|
@ -639,9 +639,10 @@ int dissect_ber_octet_string_wcb(gboolean implicit_tag, packet_info *pinfo, prot
|
|||
/* 8.8 Encoding of a null value */
|
||||
int
|
||||
dissect_ber_null(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id) {
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc;
|
||||
guint32 tag, len;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
int offset_old;
|
||||
|
||||
if(!implicit_tag){
|
||||
|
|
@ -669,9 +670,9 @@ dissect_ber_null(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tv
|
|||
int
|
||||
dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value)
|
||||
{
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
gint32 val;
|
||||
gint64 val64;
|
||||
|
|
@ -768,9 +769,9 @@ printf("INTEGERnew dissect_ber_integer(%s) entered implicit_tag:%d \n",name,impl
|
|||
int
|
||||
dissect_ber_boolean(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id)
|
||||
{
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
guint8 val;
|
||||
header_field_info *hfi;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* Routines for RFC2630 Cryptographic Message Syntax packet dissection
|
||||
* Ronnie Sahlberg 2004
|
||||
*
|
||||
* $Id: packet-cms-template.c 14169 2005-04-22 21:17:13Z gerald $
|
||||
* $Id$
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -333,11 +333,13 @@ static int dissect_eContentType(packet_info *pinfo, proto_tree *tree, tvbuff_t *
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_cms_T_eContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag, len;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
int pdu_offset = offset;
|
||||
|
||||
/* XXX Do we care about printing out the octet string? */
|
||||
|
|
@ -567,10 +569,11 @@ static int dissect_issuerAndSerialNumber(packet_info *pinfo, proto_tree *tree, t
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_cms_SubjectKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -621,10 +624,11 @@ static int dissect_signedAttrs_impl(packet_info *pinfo, proto_tree *tree, tvbuff
|
|||
}
|
||||
|
||||
|
||||
|
||||
int
|
||||
dissect_cms_SignatureValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -755,10 +759,11 @@ static int dissect_keyEncryptionAlgorithm(packet_info *pinfo, proto_tree *tree,
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_cms_EncryptedKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -842,10 +847,11 @@ static int dissect_originator(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_cms_UserKeyingMaterial(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -1003,10 +1009,11 @@ static int dissect_kari_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -1104,10 +1111,11 @@ static int dissect_contentEncryptionAlgorithm(packet_info *pinfo, proto_tree *tr
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_cms_EncryptedContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -1166,10 +1174,11 @@ dissect_cms_EnvelopedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_cms_Digest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -1235,10 +1244,11 @@ static int dissect_authenticatedAttributes_impl(packet_info *pinfo, proto_tree *
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_cms_MessageAuthenticationCode(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -1683,11 +1693,11 @@ void proto_reg_handoff_cms(void) {
|
|||
|
||||
/*--- Included file: packet-cms-dis-tab.c ---*/
|
||||
|
||||
register_ber_oid_dissector("1.2.840.113549.1.7.2", dissect_SignedData_PDU, proto_cms, "id-signedData");
|
||||
register_ber_oid_dissector("1.2.840.113549.1.7.3", dissect_EnvelopedData_PDU, proto_cms, "id-envelopedData");
|
||||
register_ber_oid_dissector("1.2.840.113549.1.7.5", dissect_DigestedData_PDU, proto_cms, "id-digestedData");
|
||||
register_ber_oid_dissector("1.2.840.113549.1.7.6", dissect_EncryptedData_PDU, proto_cms, "id-encryptedData");
|
||||
register_ber_oid_dissector("1.2.840.113549.1.9.16.1.2", dissect_AuthenticatedData_PDU, proto_cms, "id-ct-authenticatedData");
|
||||
register_ber_oid_dissector("1.2.840.113549.1.7.2", dissect_SignedData_PDU, proto_cms, "id-signedData");
|
||||
register_ber_oid_dissector("1.2.840.113549.1.7.3", dissect_EnvelopedData_PDU, proto_cms, "id-envelopedData");
|
||||
register_ber_oid_dissector("1.2.840.113549.1.7.5", dissect_DigestedData_PDU, proto_cms, "id-digestedData");
|
||||
register_ber_oid_dissector("1.2.840.113549.1.7.6", dissect_EncryptedData_PDU, proto_cms, "id-encryptedData");
|
||||
register_ber_oid_dissector("1.2.840.113549.1.9.16.1.2", dissect_AuthenticatedData_PDU, proto_cms, "id-ct-authenticatedData");
|
||||
|
||||
|
||||
/*--- End of included file: packet-cms-dis-tab.c ---*/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* Routines for RFC2630 Cryptographic Message Syntax packet dissection
|
||||
* Ronnie Sahlberg 2004
|
||||
*
|
||||
* $Id: packet-cms-template.h 12573 2004-11-22 03:36:26Z sahlberg $
|
||||
* $Id$
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
|
|||
|
|
@ -1604,9 +1604,9 @@ static int dissect_krb5_addr_type(packet_info *pinfo, proto_tree *tree, tvbuff_t
|
|||
}
|
||||
static int dissect_krb5_address(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
|
||||
{
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
char address_str[256];
|
||||
proto_item *it=NULL;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* Routines for Online Certificate Status Protocol (RFC2560) packet dissection
|
||||
* Ronnie Sahlberg 2004
|
||||
*
|
||||
* $Id: packet-ocsp-template.c 12573 2004-11-22 03:36:26Z sahlberg $
|
||||
* $Id$
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -206,10 +206,11 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_ocsp_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -367,7 +368,8 @@ static const value_string ocsp_OCSPResponseStatus_vals[] = {
|
|||
|
||||
static int
|
||||
dissect_ocsp_OCSPResponseStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -390,11 +392,12 @@ static int dissect_responseType(packet_info *pinfo, proto_tree *tree, tvbuff_t *
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_ocsp_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
/* skip past the T and L */
|
||||
offset = dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
|
|
@ -440,10 +443,11 @@ dissect_ocsp_OCSPResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_ocsp_KeyHash(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -686,7 +690,7 @@ dissect_ocsp_ServiceLocator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
|
|||
|
||||
static int
|
||||
dissect_ocsp_IA5String(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_restricted_string(implicit_tag, 0,
|
||||
offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String,
|
||||
pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
|
|
@ -1066,11 +1070,11 @@ void proto_reg_handoff_ocsp(void) {
|
|||
|
||||
/*--- Included file: packet-ocsp-dis-tab.c ---*/
|
||||
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.1", dissect_BasicOCSPResponse_PDU, proto_ocsp, "id-pkix-ocsp-basic");
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.3", dissect_CrlID_PDU, proto_ocsp, "id-pkix-ocsp-crl");
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.4", dissect_AcceptableResponses_PDU, proto_ocsp, "id-pkix-ocsp-response");
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.6", dissect_ArchiveCutoff_PDU, proto_ocsp, "id-pkix-ocsp-archive-cutoff");
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.7", dissect_ServiceLocator_PDU, proto_ocsp, "id-pkix-ocsp-service-locator");
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.1", dissect_BasicOCSPResponse_PDU, proto_ocsp, "id-pkix-ocsp-basic");
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.3", dissect_CrlID_PDU, proto_ocsp, "id-pkix-ocsp-crl");
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.4", dissect_AcceptableResponses_PDU, proto_ocsp, "id-pkix-ocsp-response");
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.6", dissect_ArchiveCutoff_PDU, proto_ocsp, "id-pkix-ocsp-archive-cutoff");
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.48.1.7", dissect_ServiceLocator_PDU, proto_ocsp, "id-pkix-ocsp-service-locator");
|
||||
|
||||
|
||||
/*--- End of included file: packet-ocsp-dis-tab.c ---*/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* Routines for Online Certificate Status Protocol (RFC2560) packet dissection
|
||||
* Ronnie Sahlberg 2004
|
||||
*
|
||||
* $Id: packet-ocsp-template.h 12573 2004-11-22 03:36:26Z sahlberg $
|
||||
* $Id$
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
/* packet-pkix1explicit.c
|
||||
* Routines for PKIX1Explitic packet dissection
|
||||
*
|
||||
* $Id: packet-pkix1explicit-template.c 12826 2004-12-24 12:16:27Z sahlberg $
|
||||
* $Id$
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -149,12 +149,14 @@ dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *tvb,
|
|||
|
||||
int
|
||||
dissect_pkix1explicit_CertificateSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_pkix1explicit_T_extnId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset,
|
||||
|
|
@ -168,6 +170,7 @@ static int dissect_extnId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_pkix1explicit_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
|
||||
|
|
@ -179,11 +182,12 @@ static int dissect_critical(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_pkix1explicit_T_extnValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
/* skip past the T and L */
|
||||
offset = dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
|
|
@ -232,7 +236,8 @@ dissect_pkix1explicit_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
|
|||
|
||||
static int
|
||||
dissect_pkix1explicit_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -300,10 +305,11 @@ dissect_pkix1explicit_DomainParameters(gboolean implicit_tag _U_, tvbuff_t *tvb,
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_pkix1explicit_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset,
|
||||
hf_index, NULL);
|
||||
offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -394,7 +400,8 @@ const value_string pkix1explicit_TerminalType_vals[] = {
|
|||
|
||||
int
|
||||
dissect_pkix1explicit_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
|
||||
offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -568,8 +575,8 @@ void proto_reg_handoff_pkix1explicit(void) {
|
|||
|
||||
/*--- Included file: packet-pkix1explicit-dis-tab.c ---*/
|
||||
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.2.1", dissect_DirectoryString_PDU, proto_pkix1explicit, "id-qt-cps");
|
||||
register_ber_oid_dissector("1.2.840.10046.2.1", dissect_DomainParameters_PDU, proto_pkix1explicit, "dhpublicnumber");
|
||||
register_ber_oid_dissector("1.3.6.1.5.5.7.2.1", dissect_DirectoryString_PDU, proto_pkix1explicit, "id-qt-cps");
|
||||
register_ber_oid_dissector("1.2.840.10046.2.1", dissect_DomainParameters_PDU, proto_pkix1explicit, "dhpublicnumber");
|
||||
|
||||
|
||||
/*--- End of included file: packet-pkix1explicit-dis-tab.c ---*/
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
/* packet-pkix1explicit.h
|
||||
* Routines for PKIX1Explicit packet dissection
|
||||
*
|
||||
* $Id: packet-pkix1explicit-template.h 12826 2004-12-24 12:16:27Z sahlberg $
|
||||
* $Id$
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* Routines for SMRSE Short Message Relay Service packet dissection
|
||||
* Ronnie Sahlberg 2004
|
||||
*
|
||||
* $Id: packet-smrse-template.c 12245 2004-10-08 20:28:04Z guy $
|
||||
* $Id$
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -162,10 +162,11 @@ static int dissect_numbering_plan(packet_info *pinfo, proto_tree *tree, tvbuff_t
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_smrse_SemiOctetString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -175,9 +176,9 @@ static int
|
|||
dissect_smrse_T_octet_format(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
char *strp,tmpstr[21];
|
||||
guint32 i, start_offset;
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
static char n2a[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
|
||||
|
||||
|
|
@ -297,10 +298,11 @@ dissect_smrse_SMR_Bind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_smrse_IMSI_Address(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
@ -369,6 +371,7 @@ dissect_smrse_SMR_Unbind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_smrse_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
|
||||
|
|
@ -405,10 +408,11 @@ static int dissect_message_reference(packet_info *pinfo, proto_tree *tree, tvbuf
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_smrse_RP_UD(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_octet_string(implicit_tag, pinfo, tree, tvb, offset, hf_index,
|
||||
NULL);
|
||||
NULL);
|
||||
|
||||
return offset;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* Routines for SMRSE Short Message Relay Service packet dissection
|
||||
* Ronnie Sahlberg 2004
|
||||
*
|
||||
* $Id: packet-smrse-template.h 12203 2004-10-05 09:18:55Z guy $
|
||||
* $Id$
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* Routines for X.509 Authentication Framework packet dissection
|
||||
* Ronnie Sahlberg 2004
|
||||
*
|
||||
* $Id: packet-x509af-template.c 14169 2005-04-22 21:17:13Z gerald $
|
||||
* $Id$
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -441,6 +441,7 @@ static int dissect_extnId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_x509af_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
|
||||
|
|
@ -452,11 +453,12 @@ static int dissect_critical(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
|
|||
}
|
||||
|
||||
|
||||
|
||||
static int
|
||||
dissect_x509af_T_extnValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
|
||||
guint8 class;
|
||||
gint8 class;
|
||||
gboolean pc, ind;
|
||||
guint32 tag;
|
||||
gint32 tag;
|
||||
guint32 len;
|
||||
/* skip past the T and L */
|
||||
offset = dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
|
||||
|
|
@ -1343,13 +1345,13 @@ void proto_reg_handoff_x509af(void) {
|
|||
|
||||
/*--- Included file: packet-x509af-dis-tab.c ---*/
|
||||
|
||||
register_ber_oid_dissector("2.5.4.36", dissect_Certificate_PDU, proto_x509af, "id-at-userCertificate");
|
||||
register_ber_oid_dissector("2.5.4.37", dissect_Certificate_PDU, proto_x509af, "id-at-cAcertificate");
|
||||
register_ber_oid_dissector("2.5.4.38", dissect_CertificateList_PDU, proto_x509af, "id-at-authorityRevocationList");
|
||||
register_ber_oid_dissector("2.5.4.39", dissect_CertificateList_PDU, proto_x509af, "id-at-certificateRevocationList");
|
||||
register_ber_oid_dissector("2.5.4.40", dissect_CertificatePair_PDU, proto_x509af, "id-at-crossCertificatePair");
|
||||
register_ber_oid_dissector("2.5.4.58", dissect_AttributeCertificate_PDU, proto_x509af, "id-at-attributeCertificate");
|
||||
register_ber_oid_dissector("2.5.4.59", dissect_CertificateList_PDU, proto_x509af, "id-at-attributeCertificateRevocationList");
|
||||
register_ber_oid_dissector("2.5.4.36", dissect_Certificate_PDU, proto_x509af, "id-at-userCertificate");
|
||||
register_ber_oid_dissector("2.5.4.37", dissect_Certificate_PDU, proto_x509af, "id-at-cAcertificate");
|
||||
register_ber_oid_dissector("2.5.4.38", dissect_CertificateList_PDU, proto_x509af, "id-at-authorityRevocationList");
|
||||
register_ber_oid_dissector("2.5.4.39", dissect_CertificateList_PDU, proto_x509af, "id-at-certificateRevocationList");
|
||||
register_ber_oid_dissector("2.5.4.40", dissect_CertificatePair_PDU, proto_x509af, "id-at-crossCertificatePair");
|
||||
register_ber_oid_dissector("2.5.4.58", dissect_AttributeCertificate_PDU, proto_x509af, "id-at-attributeCertificate");
|
||||
register_ber_oid_dissector("2.5.4.59", dissect_CertificateList_PDU, proto_x509af, "id-at-attributeCertificateRevocationList");
|
||||
|
||||
|
||||
/*--- End of included file: packet-x509af-dis-tab.c ---*/
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* Routines for X.509 Authentication Framework packet dissection
|
||||
* Ronnie Sahlberg 2004
|
||||
*
|
||||
* $Id: packet-x509af-template.h 12573 2004-11-22 03:36:26Z sahlberg $
|
||||
* $Id$
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
|
|||
Loading…
Reference in New Issue