osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Re-generate a number of ASN.1-based dissectors with the most recent 

version of asn2eth.

svn path=/trunk/; revision=12267
This commit is contained in:
Guy Harris 2004-10-11 18:36:51 +00:00
parent f0b50fb262
commit 45d05ca95e
19 changed files with 286 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
epan/dissectors/packet-h235.c
View File

@ -1,10 +1,9 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-h235.c */
/* ./packet-h235.c */
/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
/* Input file: packet-h235-template.c */
/* Include files: packet-h235-hf.c, packet-h235-ett.c, packet-h235-fn.c, packet-h235-hfarr.c, packet-h235-ettarr.c, packet-h235-val.h */
/* packet-h235.c
* Routines for H.235 packet dissection
@ -54,11 +53,6 @@ int proto_h235 = -1;
/*--- Included file: packet-h235-hf.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-h235-hf.c */
/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
static int hf_h235_nonStandardIdentifier = -1; /* OBJECT_IDENTIFIER */
static int hf_h235_data = -1; /* OCTET_STRING */
static int hf_h235_halfkey = -1; /* BIT_STRING_SIZE_0_2048 */
@ -133,11 +127,6 @@ static int hf_h235_keyDerivationOID = -1; /* OBJECT_IDENTIFIER */
/*--- Included file: packet-h235-ett.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-h235-ett.c */
/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
static gint ett_h235_NonStandardParameter = -1;
static gint ett_h235_DHset = -1;
static gint ett_h235_ECpoint = -1;
@ -171,15 +160,13 @@ PER_NOT_DECODED_YET("ToBeSigned");
/*--- Included file: packet-h235-fn.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-h235-fn.c */
/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
/*--- Fields for imported types ---*/
static int dissect_toBeSigned(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree) {
return dissect_xxx_ToBeSigned(tvb, offset, pinfo, tree, hf_h235_toBeSigned);
}
static int
dissect_h235_ChallengeString(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
offset = dissect_per_octet_string(tvb, offset, pinfo, tree, hf_index,
@ -315,7 +302,7 @@ static int dissect_clearSaltingKey(tvbuff_t *tvb, int offset, packet_info *pinfo
return dissect_h235_OCTET_STRING(tvb, offset, pinfo, tree, hf_h235_clearSaltingKey);
}
static per_sequence_t NonStandardParameter_sequence[] = {
static const per_sequence_t NonStandardParameter_sequence[] = {
{ "nonStandardIdentifier" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_nonStandardIdentifier },
{ "data" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_data },
{ NULL, 0, 0, NULL }
@ -350,7 +337,7 @@ static int dissect_generator(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
return dissect_h235_BIT_STRING_SIZE_0_2048(tvb, offset, pinfo, tree, hf_h235_generator);
}
static per_sequence_t DHset_sequence[] = {
static const per_sequence_t DHset_sequence[] = {
{ "halfkey" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_halfkey },
{ "modSize" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_modSize },
{ "generator" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_generator },
@ -395,7 +382,7 @@ static int dissect_fieldSize(tvbuff_t *tvb, int offset, packet_info *pinfo, prot
return dissect_h235_BIT_STRING_SIZE_0_511(tvb, offset, pinfo, tree, hf_h235_fieldSize);
}
static per_sequence_t ECpoint_sequence[] = {
static const per_sequence_t ECpoint_sequence[] = {
{ "x" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_x },
{ "y" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_y },
{ NULL, 0, 0, NULL }
@ -415,7 +402,7 @@ static int dissect_base(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
return dissect_h235_ECpoint(tvb, offset, pinfo, tree, hf_h235_base);
}
static per_sequence_t T_eckasdhp_sequence[] = {
static const per_sequence_t T_eckasdhp_sequence[] = {
{ "public-key" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_public_key },
{ "modulus" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_modulus },
{ "base" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_base },
@ -435,7 +422,7 @@ static int dissect_eckasdhp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto
return dissect_h235_T_eckasdhp(tvb, offset, pinfo, tree, hf_h235_eckasdhp);
}
static per_sequence_t T_eckasdh2_sequence[] = {
static const per_sequence_t T_eckasdh2_sequence[] = {
{ "public-key" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_public_key },
{ "fieldSize" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_fieldSize },
{ "base" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_base },
@ -462,7 +449,7 @@ static const value_string ECKASDH_vals[] = {
{ 0, NULL }
};
static per_choice_t ECKASDH_choice[] = {
static const per_choice_t ECKASDH_choice[] = {
{ 0, "eckasdhp" , ASN1_EXTENSION_ROOT , dissect_eckasdhp },
{ 1, "eckasdh2" , ASN1_EXTENSION_ROOT , dissect_eckasdh2 },
{ 0, NULL, 0, NULL }
@ -480,7 +467,7 @@ static int dissect_eckasdhkey(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
return dissect_h235_ECKASDH(tvb, offset, pinfo, tree, hf_h235_eckasdhkey);
}
static per_sequence_t TypedCertificate_sequence[] = {
static const per_sequence_t TypedCertificate_sequence[] = {
{ "type" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_type },
{ "certificate" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_certificatedata },
{ NULL, 0, 0, NULL }
@ -539,7 +526,7 @@ static const value_string AuthenticationBES_vals[] = {
{ 0, NULL }
};
static per_choice_t AuthenticationBES_choice[] = {
static const per_choice_t AuthenticationBES_choice[] = {
{ 0, "default" , ASN1_EXTENSION_ROOT , dissect_default },
{ 1, "radius" , ASN1_EXTENSION_ROOT , dissect_radius },
{ 0, NULL, 0, NULL }
@ -570,7 +557,7 @@ const value_string AuthenticationMechanism_vals[] = {
{ 0, NULL }
};
static per_choice_t AuthenticationMechanism_choice[] = {
static const per_choice_t AuthenticationMechanism_choice[] = {
{ 0, "dhExch" , ASN1_EXTENSION_ROOT , dissect_dhExch },
{ 1, "pwdSymEnc" , ASN1_EXTENSION_ROOT , dissect_pwdSymEnc },
{ 2, "pwdHash" , ASN1_EXTENSION_ROOT , dissect_pwdHash },
@ -630,7 +617,7 @@ static int dissect_iv16(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
return dissect_h235_IV16(tvb, offset, pinfo, tree, hf_h235_iv16);
}
static per_sequence_t Params_sequence[] = {
static const per_sequence_t Params_sequence[] = {
{ "ranInt" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_ranInt },
{ "iv8" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_iv8 },
{ "iv16" , ASN1_NOT_EXTENSION_ROOT, ASN1_OPTIONAL , dissect_iv16 },
@ -653,7 +640,7 @@ static int dissect_paramSsalt(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
return dissect_h235_Params(tvb, offset, pinfo, tree, hf_h235_paramSsalt);
}
static per_sequence_t ENCRYPTEDxxx_sequence[] = {
static const per_sequence_t ENCRYPTEDxxx_sequence[] = {
{ "algorithmOID" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_algorithmOID },
{ "paramS" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_paramS },
{ "encryptedData" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_encryptedData },
@ -693,7 +680,7 @@ static int dissect_hash(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
return dissect_h235_BIT_STRING(tvb, offset, pinfo, tree, hf_h235_hash);
}
static per_sequence_t SIGNEDxxx_sequence[] = {
static const per_sequence_t SIGNEDxxx_sequence[] = {
{ "toBeSigned" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_toBeSigned },
{ "algorithmOID" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_algorithmOID },
{ "paramS" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_paramS },
@ -716,7 +703,7 @@ static int dissect_certProtectedKey(tvbuff_t *tvb, int offset, packet_info *pinf
return dissect_h235_SIGNEDxxx(tvb, offset, pinfo, tree, hf_h235_certProtectedKey);
}
static per_sequence_t V3KeySyncMaterial_sequence[] = {
static const per_sequence_t V3KeySyncMaterial_sequence[] = {
{ "generalID" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_generalID },
{ "algorithmOID" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_algorithmOID },
{ "paramS" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_paramS },
@ -748,7 +735,7 @@ static const value_string H235Key_vals[] = {
{ 0, NULL }
};
static per_choice_t H235Key_choice[] = {
static const per_choice_t H235Key_choice[] = {
{ 0, "secureChannel" , ASN1_EXTENSION_ROOT , dissect_secureChannel },
{ 1, "sharedSecret" , ASN1_EXTENSION_ROOT , dissect_sharedSecret },
{ 2, "certProtectedKey" , ASN1_EXTENSION_ROOT , dissect_certProtectedKey },
@ -768,7 +755,7 @@ static int dissect_h235Key(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
return dissect_h235_H235Key(tvb, offset, pinfo, tree, hf_h235_h235Key);
}
static per_sequence_t ClearToken_sequence[] = {
static const per_sequence_t ClearToken_sequence[] = {
{ "tokenOID" , ASN1_EXTENSION_ROOT , ASN1_NOT_OPTIONAL, dissect_tokenOID },
{ "timeStamp" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_timeStamp },
{ "password" , ASN1_EXTENSION_ROOT , ASN1_OPTIONAL , dissect_password },
@ -796,7 +783,7 @@ static int dissect_hashedVals(tvbuff_t *tvb, int offset, packet_info *pinfo, pro
return dissect_h235_ClearToken(tvb, offset, pinfo, tree, hf_h235_hashedVals);
}
static per_sequence_t HASHEDxxx_sequence[] = {
static const per_sequence_t HASHEDxxx_sequence[] = {
{ "algorithmOID" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_algorithmOID },
{ "paramS" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_paramS },
{ "hash" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_hash },
@ -815,7 +802,7 @@ static int dissect_hashedToken(tvbuff_t *tvb, int offset, packet_info *pinfo, pr
return dissect_h235_HASHEDxxx(tvb, offset, pinfo, tree, hf_h235_hashedToken);
}
static per_sequence_t T_cryptoEncryptedToken_sequence[] = {
static const per_sequence_t T_cryptoEncryptedToken_sequence[] = {
{ "tokenOID" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_tokenOID },
{ "token" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_encryptedToken },
{ NULL, 0, 0, NULL }
@ -832,7 +819,7 @@ static int dissect_cryptoEncryptedToken(tvbuff_t *tvb, int offset, packet_info *
return dissect_h235_T_cryptoEncryptedToken(tvb, offset, pinfo, tree, hf_h235_cryptoEncryptedToken);
}
static per_sequence_t T_cryptoSignedToken_sequence[] = {
static const per_sequence_t T_cryptoSignedToken_sequence[] = {
{ "tokenOID" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_tokenOID },
{ "token" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_signedToken },
{ NULL, 0, 0, NULL }
@ -849,7 +836,7 @@ static int dissect_cryptoSignedToken(tvbuff_t *tvb, int offset, packet_info *pin
return dissect_h235_T_cryptoSignedToken(tvb, offset, pinfo, tree, hf_h235_cryptoSignedToken);
}
static per_sequence_t T_cryptoHashedToken_sequence[] = {
static const per_sequence_t T_cryptoHashedToken_sequence[] = {
{ "tokenOID" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_tokenOID },
{ "hashedVals" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_hashedVals },
{ "token" , ASN1_NO_EXTENSIONS , ASN1_NOT_OPTIONAL, dissect_hashedToken },
@ -876,7 +863,7 @@ const value_string CryptoToken_vals[] = {
{ 0, NULL }
};
static per_choice_t CryptoToken_choice[] = {
static const per_choice_t CryptoToken_choice[] = {
{ 0, "cryptoEncryptedToken" , ASN1_EXTENSION_ROOT , dissect_cryptoEncryptedToken },
{ 1, "cryptoSignedToken" , ASN1_EXTENSION_ROOT , dissect_cryptoSignedToken },
{ 2, "cryptoHashedToken" , ASN1_EXTENSION_ROOT , dissect_cryptoHashedToken },
@ -907,11 +894,6 @@ void proto_register_h235(void) {
/*--- Included file: packet-h235-hfarr.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-h235-hfarr.c */
/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
{ &hf_h235_nonStandardIdentifier,
{ "nonStandardIdentifier", "h235.nonStandardIdentifier",
FT_STRING, BASE_NONE, NULL, 0,
@ -1186,11 +1168,6 @@ void proto_register_h235(void) {
/*--- Included file: packet-h235-ettarr.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-h235-ettarr.c */
/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
&ett_h235_NonStandardParameter,
&ett_h235_DHset,
&ett_h235_ECpoint,

8
epan/dissectors/packet-h235.h
View File

@ -1,10 +1,9 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-h235.h */
/* ./packet-h235.h */
/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
/* Input file: packet-h235-template.h */
/* Include files: packet-h235-exp.h, packet-h235-valexp.h */
/* packet-h235.h
* Routines for H.235 packet dissection
@ -37,11 +36,6 @@
/*--- Included file: packet-h235-exp.h ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-h235-exp.h */
/* ../../tools/asn2eth.py -X -p h235 -c h235.cnf -s packet-h235-template H235-SECURITY-MESSAGES.asn */
extern const value_string AuthenticationMechanism_vals[];
extern const value_string CryptoToken_vals[];
int dissect_h235_TimeStamp(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);

265
epan/dissectors/packet-h248.c
View File

File diff suppressed because it is too large Load Diff

4
epan/dissectors/packet-ns_cert_exts.c
View File

@ -8,7 +8,7 @@
/* packet-ns_cert_exts.c
* Routines for NetScape Certificate Extensions packet dissection
*
* $Id: packet-ns_cert_exts-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
* $Id: packet-ns_cert_exts-template.c 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -152,7 +152,7 @@ dissect_ns_cert_exts_CertRenewalUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, in
return offset;
}
static asn_namedbit CertType_bits[] = {
static const asn_namedbit CertType_bits[] = {
{ 0, &hf_ns_cert_exts_CertType_client, -1, -1, NULL, NULL },
{ 1, &hf_ns_cert_exts_CertType_server, -1, -1, NULL, NULL },
{ 5, &hf_ns_cert_exts_CertType_ca, -1, -1, NULL, NULL },

36
epan/dissectors/packet-pkcs1.c
View File

@ -1,15 +1,14 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-pkcs1.c */
/* ./packet-pkcs1.c */
/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
/* Input file: packet-pkcs1-template.c */
/* Include files: packet-pkcs1-hf.c, packet-pkcs1-ett.c, packet-pkcs1-fn.c, packet-pkcs1-hfarr.c, packet-pkcs1-ettarr.c, packet-pkcs1-val.h */
/* packet-pkcs1.c
* Routines for PKCS#1/RFC2313 packet dissection
*
* $Id: packet-pkcs1-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
* $Id: packet-pkcs1-template.c 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -53,11 +52,6 @@ static int proto_pkcs1 = -1;
/*--- Included file: packet-pkcs1-hf.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-pkcs1-hf.c */
/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
static int hf_pkcs1_modulus = -1; /* INTEGER */
static int hf_pkcs1_publicExponent = -1; /* INTEGER */
static int hf_pkcs1_version = -1; /* Version */
@ -77,11 +71,6 @@ static int hf_pkcs1_digest = -1; /* Digest */
/*--- Included file: packet-pkcs1-ett.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-pkcs1-ett.c */
/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
static gint ett_pkcs1_RSAPublicKey = -1;
static gint ett_pkcs1_RSAPrivateKey = -1;
static gint ett_pkcs1_DigestInfo = -1;
@ -92,11 +81,6 @@ static gint ett_pkcs1_DigestInfo = -1;
/*--- Included file: packet-pkcs1-fn.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-pkcs1-fn.c */
/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
/*--- Fields for imported types ---*/
@ -133,7 +117,7 @@ static int dissect_coefficient(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_pkcs1_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_coefficient);
}
static ber_sequence RSAPublicKey_sequence[] = {
static const ber_sequence RSAPublicKey_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent },
{ 0, 0, 0, NULL }
@ -159,7 +143,7 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_pkcs1_Version(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_version);
}
static ber_sequence RSAPrivateKey_sequence[] = {
static const ber_sequence RSAPrivateKey_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_modulus },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_publicExponent },
@ -203,7 +187,7 @@ static int dissect_digest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_pkcs1_Digest(FALSE, tvb, offset, pinfo, tree, hf_pkcs1_digest);
}
static ber_sequence DigestInfo_sequence[] = {
static const ber_sequence DigestInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_digest },
{ 0, 0, 0, NULL }
@ -229,11 +213,6 @@ void proto_register_pkcs1(void) {
/*--- Included file: packet-pkcs1-hfarr.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-pkcs1-hfarr.c */
/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
{ &hf_pkcs1_modulus,
{ "modulus", "pkcs1.modulus",
FT_INT32, BASE_DEC, NULL, 0,
@ -288,11 +267,6 @@ void proto_register_pkcs1(void) {
/*--- Included file: packet-pkcs1-ettarr.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-pkcs1-ettarr.c */
/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
&ett_pkcs1_RSAPublicKey,
&ett_pkcs1_RSAPrivateKey,
&ett_pkcs1_DigestInfo,

10
epan/dissectors/packet-pkcs1.h
View File

@ -1,15 +1,14 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-pkcs1.h */
/* ./packet-pkcs1.h */
/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
/* Input file: packet-pkcs1-template.h */
/* Include files: packet-pkcs1-exp.h, packet-pkcs1-valexp.h */
/* packet-pkcs1.h
* Routines for PKCS#1/RFC2313 packet dissection
*
* $Id: packet-pkcs1-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
* $Id: packet-pkcs1-template.h 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -36,11 +35,6 @@
/*--- Included file: packet-pkcs1-exp.h ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-pkcs1-exp.h */
/* ../../tools/asn2eth.py -X -b -p pkcs1 -c pkcs1.cnf -s packet-pkcs1-template PKCS1.asn */
int dissect_pkcs1_RSAPublicKey(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_pkcs1_RSAPrivateKey(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_pkcs1_DigestInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);

12
epan/dissectors/packet-pkinit.c
View File

@ -8,7 +8,7 @@
/* packet-pkinit.c
* Routines for PKINIT packet dissection
*
* $Id: packet-pkinit-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
* $Id: packet-pkinit-template.c 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -110,7 +110,7 @@ static const value_string TrustedCA_vals[] = {
{ 0, NULL }
};
static ber_choice TrustedCA_choice[] = {
static const ber_choice TrustedCA_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_caName },
{ 2, BER_CLASS_CON, 2, 0, dissect_issuerAndSerial },
{ 0, 0, 0, 0, NULL }
@ -127,7 +127,7 @@ static int dissect_trustedCertifiers_item(packet_info *pinfo, proto_tree *tree,
return dissect_pkinit_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers_item);
}
static ber_sequence SEQUNCE_OF_TrustedCA_sequence_of[1] = {
static const ber_sequence SEQUNCE_OF_TrustedCA_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item },
};
@ -142,7 +142,7 @@ static int dissect_trustedCertifiers(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_pkinit_SEQUNCE_OF_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers);
}
static ber_sequence PaPkAsReq_sequence[] = {
static const ber_sequence PaPkAsReq_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_signedAuthPack },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_trustedCertifiers },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_kdcCert },
@ -164,7 +164,7 @@ static const value_string PaPkAsRep_vals[] = {
{ 0, NULL }
};
static ber_choice PaPkAsRep_choice[] = {
static const ber_choice PaPkAsRep_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_dhSignedData },
{ 1, BER_CLASS_CON, 1, 0, dissect_encKeyPack },
{ 0, 0, 0, 0, NULL }
@ -212,7 +212,7 @@ void proto_register_pkinit(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"PaPkAsReq/trustedCertifiers", HFILL }},
{ &hf_pkinit_trustedCertifiers_item,
{ "Item[##]", "pkinit.trustedCertifiers_item",
{ "Item", "pkinit.trustedCertifiers_item",
FT_UINT32, BASE_DEC, VALS(TrustedCA_vals), 0,
"PaPkAsReq/trustedCertifiers/_item", HFILL }},
{ &hf_pkinit_kdcCert,

4
epan/dissectors/packet-pkix1explicit.c
View File

@ -10,7 +10,7 @@
/* packet-pkix1explicit.c
* Routines for PKIX1Explitic packet dissection
*
* $Id: packet-pkix1explicit-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
* $Id: packet-pkix1explicit-template.c 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -143,7 +143,7 @@ static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_pkix1explicit_TeletexString(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value);
}
static ber_sequence TeletexDomainDefinedAttribute_sequence[] = {
static const ber_sequence TeletexDomainDefinedAttribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_value },
{ 0, 0, 0, NULL }

2
epan/dissectors/packet-pkix1explicit.h
View File

@ -8,7 +8,7 @@
/* packet-pkix1explicit.h
* Routines for PKIX1Explicit packet dissection
*
* $Id: packet-pkix1explicit-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
* $Id: packet-pkix1explicit-template.h 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>

12
epan/dissectors/packet-pkix1implicit.c
View File

@ -8,7 +8,7 @@
/* packet-pkix1implicit.c
* Routines for PKIX1Implitic packet dissection
*
* $Id: packet-pkix1implicit-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
* $Id: packet-pkix1implicit-template.c 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -130,7 +130,7 @@ static const value_string DisplayText_vals[] = {
{ 0, NULL }
};
static ber_choice DisplayText_choice[] = {
static const ber_choice DisplayText_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_VisibleString, BER_FLAGS_NOOWNTAG, dissect_visibleString },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_BMPString, BER_FLAGS_NOOWNTAG, dissect_bmpString },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_NOOWNTAG, dissect_utf8String },
@ -163,7 +163,7 @@ static int dissect_noticeNumbers_item(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_pkix1implicit_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers_item);
}
static ber_sequence SEQUNCE_OF_INTEGER_sequence_of[1] = {
static const ber_sequence SEQUNCE_OF_INTEGER_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers_item },
};
@ -178,7 +178,7 @@ static int dissect_noticeNumbers(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkix1implicit_SEQUNCE_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers);
}
static ber_sequence NoticeReference_sequence[] = {
static const ber_sequence NoticeReference_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_organization },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_noticeNumbers },
{ 0, 0, 0, NULL }
@ -195,7 +195,7 @@ static int dissect_noticeRef(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_pkix1implicit_NoticeReference(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeRef);
}
static ber_sequence UserNotice_sequence[] = {
static const ber_sequence UserNotice_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_noticeRef },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_explicitText },
{ 0, 0, 0, NULL }
@ -239,7 +239,7 @@ void proto_register_pkix1implicit(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"NoticeReference/noticeNumbers", HFILL }},
{ &hf_pkix1implicit_noticeNumbers_item,
{ "Item[##]", "pkix1implicit.noticeNumbers_item",
{ "Item", "pkix1implicit.noticeNumbers_item",
FT_INT32, BASE_DEC, NULL, 0,
"NoticeReference/noticeNumbers/_item", HFILL }},
{ &hf_pkix1implicit_visibleString,

2
epan/dissectors/packet-pkix1implicit.h
View File

@ -8,7 +8,7 @@
/* packet-pkix1implicit.h
* Routines for PKIX1Implicit packet dissection
*
* $Id: packet-pkix1implicit-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
* $Id: packet-pkix1implicit-template.h 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>

78
epan/dissectors/packet-x509af.c
View File

@ -8,7 +8,7 @@
/* packet-x509af.c
* Routines for X.509 Authentication Framework packet dissection
*
* $Id: packet-x509af-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
* $Id: packet-x509af-template.c 12245 2004-10-08 20:28:04Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -192,7 +192,7 @@ dissect_hf_x509af_extension_type(packet_info *pinfo, proto_tree *tree, tvbuff_t
return offset;
}
static ber_sequence Extension_sequence[] = {
static const ber_sequence Extension_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_x509af_extension_id },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical },
{ BER_CLASS_ANY, 0, 0, dissect_hf_x509af_extension_type },
@ -225,7 +225,7 @@ dissect_hf_x509af_algorithm_type(packet_info *pinfo, proto_tree *tree, tvbuff_t
}
/* Algorithm Identifier can not yet be handled by the compiler */
static ber_sequence AlgorithmIdentifier_sequence[] = {
static const ber_sequence AlgorithmIdentifier_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_x509af_algorithm_id },
{ BER_CLASS_ANY, 0, 0, dissect_hf_x509af_algorithm_type },
{ 0, 0, 0, NULL }
@ -368,7 +368,7 @@ static const value_string Time_vals[] = {
{ 0, NULL }
};
static ber_choice Time_choice[] = {
static const ber_choice Time_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_UTCTime, BER_FLAGS_NOOWNTAG, dissect_utcTime },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_generalizedTime },
{ 0, 0, 0, 0, NULL }
@ -397,7 +397,7 @@ static int dissect_revocationDate(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509af_Time(FALSE, tvb, offset, pinfo, tree, hf_x509af_revocationDate);
}
static ber_sequence Validity_sequence[] = {
static const ber_sequence Validity_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter },
{ 0, 0, 0, NULL }
@ -430,7 +430,7 @@ static int dissect_subjectPublicKey(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509af_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509af_subjectPublicKey);
}
static ber_sequence SubjectPublicKeyInfo_sequence[] = {
static const ber_sequence SubjectPublicKeyInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectPublicKey },
{ 0, 0, 0, NULL }
@ -451,7 +451,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_x509af_Extension(FALSE, tvb, offset, pinfo, tree, hf_x509af_Extensions_item);
}
static ber_sequence Extensions_sequence_of[1] = {
static const ber_sequence Extensions_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
};
@ -472,7 +472,7 @@ static int dissect_crlExtensions(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509af_Extensions(FALSE, tvb, offset, pinfo, tree, hf_x509af_crlExtensions);
}
static ber_sequence T_signedCertificate_sequence[] = {
static const ber_sequence T_signedCertificate_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
@ -497,7 +497,7 @@ static int dissect_signedCertificate(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509af_T_signedCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificate);
}
static ber_sequence Certificate_sequence[] = {
static const ber_sequence Certificate_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -527,7 +527,7 @@ static int dissect_certificate(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509af_Certificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificate);
}
static ber_sequence CrossCertificates_set_of[1] = {
static const ber_sequence CrossCertificates_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CrossCertificates_item },
};
@ -542,7 +542,7 @@ static int dissect_ForwardCertificationPath_item(packet_info *pinfo, proto_tree
return dissect_x509af_CrossCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_ForwardCertificationPath_item);
}
static ber_sequence ForwardCertificationPath_sequence_of[1] = {
static const ber_sequence ForwardCertificationPath_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ForwardCertificationPath_item },
};
@ -557,7 +557,7 @@ static int dissect_certificationPath(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509af_ForwardCertificationPath(FALSE, tvb, offset, pinfo, tree, hf_x509af_certificationPath);
}
static ber_sequence Certificates_sequence[] = {
static const ber_sequence Certificates_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_certificationPath },
{ 0, 0, 0, NULL }
@ -571,7 +571,7 @@ dissect_x509af_Certificates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
return offset;
}
static ber_sequence CertificatePair_sequence[] = {
static const ber_sequence CertificatePair_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_issuedByThisCA },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_issuedToThisCA },
{ 0, 0, 0, NULL }
@ -588,7 +588,7 @@ static int dissect_theCACertificates_item(packet_info *pinfo, proto_tree *tree,
return dissect_x509af_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates_item);
}
static ber_sequence SEQUNCE_OF_CertificatePair_sequence_of[1] = {
static const ber_sequence SEQUNCE_OF_CertificatePair_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_theCACertificates_item },
};
@ -603,7 +603,7 @@ static int dissect_theCACertificates(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509af_SEQUNCE_OF_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates);
}
static ber_sequence CertificationPath_sequence[] = {
static const ber_sequence CertificationPath_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_userCertificate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_theCACertificates },
{ 0, 0, 0, NULL }
@ -617,7 +617,7 @@ dissect_x509af_CertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
return offset;
}
static ber_sequence T_revokedCertificates_item_sequence[] = {
static const ber_sequence T_revokedCertificates_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_userCertificate1 },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_revocationDate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_crlEntryExtensions },
@ -635,7 +635,7 @@ static int dissect_revokedCertificates_item(packet_info *pinfo, proto_tree *tree
return dissect_x509af_T_revokedCertificates_item(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates_item);
}
static ber_sequence T_revokedCertificates_sequence_of[1] = {
static const ber_sequence T_revokedCertificates_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_revokedCertificates_item },
};
@ -650,7 +650,7 @@ static int dissect_revokedCertificates(packet_info *pinfo, proto_tree *tree, tvb
return dissect_x509af_T_revokedCertificates(FALSE, tvb, offset, pinfo, tree, hf_x509af_revokedCertificates);
}
static ber_sequence T_signedCertificateList_sequence[] = {
static const ber_sequence T_signedCertificateList_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
{ BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer },
@ -672,7 +672,7 @@ static int dissect_signedCertificateList(packet_info *pinfo, proto_tree *tree, t
return dissect_x509af_T_signedCertificateList(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedCertificateList);
}
static ber_sequence CertificateList_sequence[] = {
static const ber_sequence CertificateList_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedCertificateList },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -687,7 +687,7 @@ dissect_x509af_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
return offset;
}
static ber_sequence IssuerSerial_sequence[] = {
static const ber_sequence IssuerSerial_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer1 },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serial },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerUID },
@ -712,7 +712,7 @@ static const value_string InfoSubject_vals[] = {
{ 0, NULL }
};
static ber_choice InfoSubject_choice[] = {
static const ber_choice InfoSubject_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID },
{ 1, BER_CLASS_CON, 1, 0, dissect_infoSubjectName },
{ 0, 0, 0, 0, NULL }
@ -729,7 +729,7 @@ static int dissect_info_subject(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509af_InfoSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_info_subject);
}
static ber_sequence AttCertValidityPeriod_sequence[] = {
static const ber_sequence AttCertValidityPeriod_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notBeforeTime },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_notAfterTime },
{ 0, 0, 0, NULL }
@ -746,7 +746,7 @@ static int dissect_attCertValidityPeriod(packet_info *pinfo, proto_tree *tree, t
return dissect_x509af_AttCertValidityPeriod(FALSE, tvb, offset, pinfo, tree, hf_x509af_attCertValidityPeriod);
}
static ber_sequence SEQUNCE_OF_Attribute_sequence_of[1] = {
static const ber_sequence SEQUNCE_OF_Attribute_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item },
};
@ -761,7 +761,7 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509af_SEQUNCE_OF_Attribute(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributes);
}
static ber_sequence AttributeCertificateInfo_sequence[] = {
static const ber_sequence AttributeCertificateInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info_subject },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer1 },
@ -785,7 +785,7 @@ static int dissect_signedAttributeCertificateInfo(packet_info *pinfo, proto_tree
return dissect_x509af_AttributeCertificateInfo(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedAttributeCertificateInfo);
}
static ber_sequence AttributeCertificate_sequence[] = {
static const ber_sequence AttributeCertificate_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signedAttributeCertificateInfo },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_encrypted },
@ -803,7 +803,7 @@ static int dissect_attributeCertificate(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509af_AttributeCertificate(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributeCertificate);
}
static ber_sequence ACPathData_sequence[] = {
static const ber_sequence ACPathData_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certificate },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_attributeCertificate },
{ 0, 0, 0, NULL }
@ -820,7 +820,7 @@ static int dissect_acPath_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509af_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath_item);
}
static ber_sequence SEQUNCE_OF_ACPathData_sequence_of[1] = {
static const ber_sequence SEQUNCE_OF_ACPathData_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_acPath_item },
};
@ -835,7 +835,7 @@ static int dissect_acPath(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_x509af_SEQUNCE_OF_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath);
}
static ber_sequence AttributeCertificationPath_sequence[] = {
static const ber_sequence AttributeCertificationPath_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeCertificate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_acPath },
{ 0, 0, 0, NULL }
@ -856,7 +856,7 @@ static const value_string AssertionSubject_vals[] = {
{ 0, NULL }
};
static ber_choice AssertionSubject_choice[] = {
static const ber_choice AssertionSubject_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_baseCertificateID },
{ 1, BER_CLASS_CON, 1, 0, dissect_assertionSubjectName },
{ 0, 0, 0, 0, NULL }
@ -873,7 +873,7 @@ static int dissect_assertion_subject(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509af_AssertionSubject(FALSE, tvb, offset, pinfo, tree, hf_x509af_assertion_subject);
}
static ber_sequence SET_OF_AttributeType_set_of[1] = {
static const ber_sequence SET_OF_AttributeType_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attType_item },
};
@ -888,7 +888,7 @@ static int dissect_attType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509af_SET_OF_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_x509af_attType);
}
static ber_sequence AttributeCertificateAssertion_sequence[] = {
static const ber_sequence AttributeCertificateAssertion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_assertion_subject },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_assertionIssuer },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_attCertValidity },
@ -1037,7 +1037,7 @@ void proto_register_x509af(void) {
FT_STRING, BASE_NONE, NULL, 0,
"Time/generalizedTime", HFILL }},
{ &hf_x509af_Extensions_item,
{ "Item[##]", "x509af.Extensions_item",
{ "Item", "x509af.Extensions_item",
FT_NONE, BASE_NONE, NULL, 0,
"Extensions/_item", HFILL }},
{ &hf_x509af_userCertificate,
@ -1049,11 +1049,11 @@ void proto_register_x509af(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"Certificates/certificationPath", HFILL }},
{ &hf_x509af_ForwardCertificationPath_item,
{ "Item[##]", "x509af.ForwardCertificationPath_item",
{ "Item", "x509af.ForwardCertificationPath_item",
FT_UINT32, BASE_DEC, NULL, 0,
"ForwardCertificationPath/_item", HFILL }},
{ &hf_x509af_CrossCertificates_item,
{ "Item(##)", "x509af.CrossCertificates_item",
{ "Item", "x509af.CrossCertificates_item",
FT_NONE, BASE_NONE, NULL, 0,
"CrossCertificates/_item", HFILL }},
{ &hf_x509af_theCACertificates,
@ -1061,7 +1061,7 @@ void proto_register_x509af(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"CertificationPath/theCACertificates", HFILL }},
{ &hf_x509af_theCACertificates_item,
{ "Item[##]", "x509af.theCACertificates_item",
{ "Item", "x509af.theCACertificates_item",
FT_NONE, BASE_NONE, NULL, 0,
"CertificationPath/theCACertificates/_item", HFILL }},
{ &hf_x509af_issuedByThisCA,
@ -1089,7 +1089,7 @@ void proto_register_x509af(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"CertificateList/signedCertificateList/revokedCertificates", HFILL }},
{ &hf_x509af_revokedCertificates_item,
{ "Item[##]", "x509af.revokedCertificates_item",
{ "Item", "x509af.revokedCertificates_item",
FT_NONE, BASE_NONE, NULL, 0,
"CertificateList/signedCertificateList/revokedCertificates/_item", HFILL }},
{ &hf_x509af_userCertificate1,
@ -1117,7 +1117,7 @@ void proto_register_x509af(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"AttributeCertificationPath/acPath", HFILL }},
{ &hf_x509af_acPath_item,
{ "Item[##]", "x509af.acPath_item",
{ "Item", "x509af.acPath_item",
FT_NONE, BASE_NONE, NULL, 0,
"AttributeCertificationPath/acPath/_item", HFILL }},
{ &hf_x509af_certificate,
@ -1153,7 +1153,7 @@ void proto_register_x509af(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"AttributeCertificateInfo/attributes", HFILL }},
{ &hf_x509af_attributes_item,
{ "Item[##]", "x509af.attributes_item",
{ "Item", "x509af.attributes_item",
FT_NONE, BASE_NONE, NULL, 0,
"AttributeCertificateInfo/attributes/_item", HFILL }},
{ &hf_x509af_issuerUniqueID,
@ -1197,7 +1197,7 @@ void proto_register_x509af(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"AttributeCertificateAssertion/attType", HFILL }},
{ &hf_x509af_attType_item,
{ "Item(##)", "x509af.attType_item",
{ "Item", "x509af.attType_item",
FT_STRING, BASE_NONE, NULL, 0,
"AttributeCertificateAssertion/attType/_item", HFILL }},

2
epan/dissectors/packet-x509af.h
View File

@ -8,7 +8,7 @@
/* packet-x509af.h
* Routines for X.509 Authentication Framework packet dissection
*
* $Id: packet-x509af-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
* $Id: packet-x509af-template.h 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>

90
epan/dissectors/packet-x509ce.c
View File

@ -8,7 +8,7 @@
/* packet-x509ce.c
* Routines for X.509 Certificate Extensions packet dissection
*
* $Id: packet-x509ce-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
* $Id: packet-x509ce-template.c 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -277,7 +277,7 @@ static int dissect_uniformResourceIdentifier_impl(packet_info *pinfo, proto_tree
return dissect_x509ce_IA5String(TRUE, tvb, offset, pinfo, tree, hf_x509ce_uniformResourceIdentifier);
}
static ber_sequence EDIPartyName_sequence[] = {
static const ber_sequence EDIPartyName_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_nameAssigner_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_partyName_impl },
{ 0, 0, 0, NULL }
@ -330,7 +330,7 @@ static const value_string GeneralName_vals[] = {
{ 0, NULL }
};
static ber_choice GeneralName_choice[] = {
static const ber_choice GeneralName_choice[] = {
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_rfc822Name_impl },
{ 2, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_dNSName_impl },
{ 4, BER_CLASS_CON, 4, BER_FLAGS_IMPLTAG, dissect_directoryName_impl },
@ -367,7 +367,7 @@ static int dissect_deltaLocation(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509ce_GeneralName(FALSE, tvb, offset, pinfo, tree, hf_x509ce_deltaLocation);
}
static ber_sequence GeneralNames_sequence_of[1] = {
static const ber_sequence GeneralNames_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item },
};
@ -391,7 +391,7 @@ static int dissect_fullName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509ce_GeneralNames(TRUE, tvb, offset, pinfo, tree, hf_x509ce_fullName);
}
static ber_sequence AuthorityKeyIdentifier_sequence[] = {
static const ber_sequence AuthorityKeyIdentifier_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_keyIdentifier_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertIssuer_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_authorityCertSerialNumber_impl },
@ -414,7 +414,7 @@ dissect_x509ce_SubjectKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, in
return offset;
}
static asn_namedbit KeyUsage_bits[] = {
static const asn_namedbit KeyUsage_bits[] = {
{ 0, &hf_x509ce_KeyUsage_digitalSignature, -1, -1, NULL, NULL },
{ 1, &hf_x509ce_KeyUsage_nonRepudiation, -1, -1, NULL, NULL },
{ 2, &hf_x509ce_KeyUsage_keyEncipherment, -1, -1, NULL, NULL },
@ -448,7 +448,7 @@ static int dissect_KeyPurposeIDs_item(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_x509ce_KeyPurposeId(FALSE, tvb, offset, pinfo, tree, hf_x509ce_KeyPurposeIDs_item);
}
static ber_sequence KeyPurposeIDs_sequence_of[1] = {
static const ber_sequence KeyPurposeIDs_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_KeyPurposeIDs_item },
};
@ -489,7 +489,7 @@ static int dissect_nextDelta(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_x509ce_GeneralizedTime(FALSE, tvb, offset, pinfo, tree, hf_x509ce_nextDelta);
}
static ber_sequence PrivateKeyUsagePeriod_sequence[] = {
static const ber_sequence PrivateKeyUsagePeriod_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notBefore_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_notAfter_impl },
{ 0, 0, 0, NULL }
@ -521,7 +521,7 @@ static int dissect_subjectDomainPolicy(packet_info *pinfo, proto_tree *tree, tvb
return dissect_x509ce_CertPolicyId(FALSE, tvb, offset, pinfo, tree, hf_x509ce_subjectDomainPolicy);
}
static ber_sequence PolicyQualifierInfo_sequence[] = {
static const ber_sequence PolicyQualifierInfo_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -536,7 +536,7 @@ static int dissect_policyQualifiers_item(packet_info *pinfo, proto_tree *tree, t
return dissect_x509ce_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers_item);
}
static ber_sequence SEQUNCE_OF_PolicyQualifierInfo_sequence_of[1] = {
static const ber_sequence SEQUNCE_OF_PolicyQualifierInfo_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policyQualifiers_item },
};
@ -551,7 +551,7 @@ static int dissect_policyQualifiers(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509ce_SEQUNCE_OF_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers);
}
static ber_sequence PolicyInformation_sequence[] = {
static const ber_sequence PolicyInformation_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policyQualifiers },
{ 0, 0, 0, NULL }
@ -568,7 +568,7 @@ static int dissect_CertificatePoliciesSyntax_item(packet_info *pinfo, proto_tree
return dissect_x509ce_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CertificatePoliciesSyntax_item);
}
static ber_sequence CertificatePoliciesSyntax_sequence_of[1] = {
static const ber_sequence CertificatePoliciesSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CertificatePoliciesSyntax_item },
};
@ -580,7 +580,7 @@ dissect_x509ce_CertificatePoliciesSyntax(gboolean implicit_tag _U_, tvbuff_t *tv
return offset;
}
static ber_sequence PolicyMappingsSyntax_item_sequence[] = {
static const ber_sequence PolicyMappingsSyntax_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_issuerDomainPolicy },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_subjectDomainPolicy },
{ 0, 0, 0, NULL }
@ -597,7 +597,7 @@ static int dissect_PolicyMappingsSyntax_item(packet_info *pinfo, proto_tree *tre
return dissect_x509ce_PolicyMappingsSyntax_item(FALSE, tvb, offset, pinfo, tree, hf_x509ce_PolicyMappingsSyntax_item);
}
static ber_sequence PolicyMappingsSyntax_sequence_of[1] = {
static const ber_sequence PolicyMappingsSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_PolicyMappingsSyntax_item },
};
@ -609,7 +609,7 @@ dissect_x509ce_PolicyMappingsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, in
return offset;
}
static ber_sequence AttributesSyntax_sequence_of[1] = {
static const ber_sequence AttributesSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_AttributesSyntax_item },
};
@ -671,7 +671,7 @@ static int dissect_modulus(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509ce_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509ce_modulus);
}
static ber_sequence BasicConstraintsSyntax_sequence[] = {
static const ber_sequence BasicConstraintsSyntax_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_cA },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pathLenConstraint },
{ 0, 0, 0, NULL }
@ -700,7 +700,7 @@ static int dissect_maximum_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509ce_BaseDistance(TRUE, tvb, offset, pinfo, tree, hf_x509ce_maximum);
}
static ber_sequence GeneralSubtree_sequence[] = {
static const ber_sequence GeneralSubtree_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_base },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minimum_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_maximum_impl },
@ -718,7 +718,7 @@ static int dissect_GeneralSubtrees_item(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509ce_GeneralSubtree(FALSE, tvb, offset, pinfo, tree, hf_x509ce_GeneralSubtrees_item);
}
static ber_sequence GeneralSubtrees_sequence_of[1] = {
static const ber_sequence GeneralSubtrees_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_GeneralSubtrees_item },
};
@ -736,7 +736,7 @@ static int dissect_excludedSubtrees_impl(packet_info *pinfo, proto_tree *tree, t
return dissect_x509ce_GeneralSubtrees(TRUE, tvb, offset, pinfo, tree, hf_x509ce_excludedSubtrees);
}
static ber_sequence NameConstraintsSyntax_sequence[] = {
static const ber_sequence NameConstraintsSyntax_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_permittedSubtrees_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_excludedSubtrees_impl },
{ 0, 0, 0, NULL }
@ -765,7 +765,7 @@ static int dissect_inhibitPolicyMapping_impl(packet_info *pinfo, proto_tree *tre
return dissect_x509ce_SkipCerts(TRUE, tvb, offset, pinfo, tree, hf_x509ce_inhibitPolicyMapping);
}
static ber_sequence PolicyConstraintsSyntax_sequence[] = {
static const ber_sequence PolicyConstraintsSyntax_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requireExplicitPolicy_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_inhibitPolicyMapping_impl },
{ 0, 0, 0, NULL }
@ -830,7 +830,7 @@ static const value_string DistributionPointName_vals[] = {
{ 0, NULL }
};
static ber_choice DistributionPointName_choice[] = {
static const ber_choice DistributionPointName_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_fullName_impl },
{ 1, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_nameRelativeToCRLIssuer_impl },
{ 0, 0, 0, 0, NULL }
@ -847,7 +847,7 @@ static int dissect_distributionPoint_impl(packet_info *pinfo, proto_tree *tree,
return dissect_x509ce_DistributionPointName(TRUE, tvb, offset, pinfo, tree, hf_x509ce_distributionPoint);
}
static asn_namedbit OnlyCertificateTypes_bits[] = {
static const asn_namedbit OnlyCertificateTypes_bits[] = {
{ 0, &hf_x509ce_OnlyCertificateTypes_userPublicKey, -1, -1, NULL, NULL },
{ 1, &hf_x509ce_OnlyCertificateTypes_cA, -1, -1, NULL, NULL },
{ 2, &hf_x509ce_OnlyCertificateTypes_userAttribute, -1, -1, NULL, NULL },
@ -868,7 +868,7 @@ static int dissect_onlyContains_impl(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509ce_OnlyCertificateTypes(TRUE, tvb, offset, pinfo, tree, hf_x509ce_onlyContains);
}
static asn_namedbit ReasonFlags_bits[] = {
static const asn_namedbit ReasonFlags_bits[] = {
{ 0, &hf_x509ce_ReasonFlags_unused, -1, -1, NULL, NULL },
{ 1, &hf_x509ce_ReasonFlags_keyCompromise, -1, -1, NULL, NULL },
{ 2, &hf_x509ce_ReasonFlags_cACompromise, -1, -1, NULL, NULL },
@ -896,7 +896,7 @@ static int dissect_reasons_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509ce_ReasonFlags(TRUE, tvb, offset, pinfo, tree, hf_x509ce_reasons);
}
static ber_sequence NumberRange_sequence[] = {
static const ber_sequence NumberRange_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_startingNumber_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_endingNumber_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_modulus },
@ -929,7 +929,7 @@ static int dissect_cRLStreamIdentifier_impl(packet_info *pinfo, proto_tree *tree
return dissect_x509ce_CRLStreamIdentifier(TRUE, tvb, offset, pinfo, tree, hf_x509ce_cRLStreamIdentifier);
}
static ber_sequence BaseRevocationInfo_sequence[] = {
static const ber_sequence BaseRevocationInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLStreamIdentifier_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_cRLNumber_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_baseThisUpdate_impl },
@ -947,7 +947,7 @@ static int dissect_baseRevocationInfo_impl(packet_info *pinfo, proto_tree *tree,
return dissect_x509ce_BaseRevocationInfo(TRUE, tvb, offset, pinfo, tree, hf_x509ce_baseRevocationInfo);
}
static ber_sequence PerAuthorityScope_sequence[] = {
static const ber_sequence PerAuthorityScope_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_authorityName_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_onlyContains_impl },
@ -970,7 +970,7 @@ static int dissect_CRLScopeSyntax_item(packet_info *pinfo, proto_tree *tree, tvb
return dissect_x509ce_PerAuthorityScope(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CRLScopeSyntax_item);
}
static ber_sequence CRLScopeSyntax_sequence_of[1] = {
static const ber_sequence CRLScopeSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLScopeSyntax_item },
};
@ -985,7 +985,7 @@ static int dissect_cRLScope(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509ce_CRLScopeSyntax(FALSE, tvb, offset, pinfo, tree, hf_x509ce_cRLScope);
}
static ber_sequence DeltaRefInfo_sequence[] = {
static const ber_sequence DeltaRefInfo_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_lastDelta },
{ 0, 0, 0, NULL }
@ -1002,7 +1002,7 @@ static int dissect_deltaRefInfo_impl(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509ce_DeltaRefInfo(TRUE, tvb, offset, pinfo, tree, hf_x509ce_deltaRefInfo);
}
static ber_sequence CRLReferral_sequence[] = {
static const ber_sequence CRLReferral_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_issuer_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_location_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_deltaRefInfo_impl },
@ -1029,7 +1029,7 @@ static const value_string StatusReferral_vals[] = {
{ 0, NULL }
};
static ber_choice StatusReferral_choice[] = {
static const ber_choice StatusReferral_choice[] = {
{ 0, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_cRLReferral_impl },
{ 0, 0, 0, 0, NULL }
};
@ -1045,7 +1045,7 @@ static int dissect_StatusReferrals_item(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509ce_StatusReferral(FALSE, tvb, offset, pinfo, tree, hf_x509ce_StatusReferrals_item);
}
static ber_sequence StatusReferrals_sequence_of[1] = {
static const ber_sequence StatusReferrals_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item },
};
@ -1072,7 +1072,7 @@ dissect_x509ce_OrderedListSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
return offset;
}
static ber_sequence DeltaInformation_sequence[] = {
static const ber_sequence DeltaInformation_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nextDelta },
{ 0, 0, 0, NULL }
@ -1086,7 +1086,7 @@ dissect_x509ce_DeltaInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
return offset;
}
static ber_sequence DistributionPoint_sequence[] = {
static const ber_sequence DistributionPoint_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_reasons_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cRLIssuer_impl },
@ -1104,7 +1104,7 @@ static int dissect_CRLDistPointsSyntax_item(packet_info *pinfo, proto_tree *tree
return dissect_x509ce_DistributionPoint(FALSE, tvb, offset, pinfo, tree, hf_x509ce_CRLDistPointsSyntax_item);
}
static ber_sequence CRLDistPointsSyntax_sequence_of[1] = {
static const ber_sequence CRLDistPointsSyntax_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_CRLDistPointsSyntax_item },
};
@ -1116,7 +1116,7 @@ dissect_x509ce_CRLDistPointsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int
return offset;
}
static ber_sequence IssuingDistPointSyntax_sequence[] = {
static const ber_sequence IssuingDistPointSyntax_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsUserPublicKeyCerts_impl },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_containsCACerts_impl },
@ -1361,7 +1361,7 @@ void proto_register_x509ce(void) {
FT_INT32, BASE_DEC, NULL, 0,
"AuthorityKeyIdentifier/authorityCertSerialNumber", HFILL }},
{ &hf_x509ce_KeyPurposeIDs_item,
{ "Item[##]", "x509ce.KeyPurposeIDs_item",
{ "Item", "x509ce.KeyPurposeIDs_item",
FT_STRING, BASE_NONE, NULL, 0,
"KeyPurposeIDs/_item", HFILL }},
{ &hf_x509ce_notBefore,
@ -1373,7 +1373,7 @@ void proto_register_x509ce(void) {
FT_STRING, BASE_NONE, NULL, 0,
"PrivateKeyUsagePeriod/notAfter", HFILL }},
{ &hf_x509ce_CertificatePoliciesSyntax_item,
{ "Item[##]", "x509ce.CertificatePoliciesSyntax_item",
{ "Item", "x509ce.CertificatePoliciesSyntax_item",
FT_NONE, BASE_NONE, NULL, 0,
"CertificatePoliciesSyntax/_item", HFILL }},
{ &hf_x509ce_policyIdentifier,
@ -1385,11 +1385,11 @@ void proto_register_x509ce(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"PolicyInformation/policyQualifiers", HFILL }},
{ &hf_x509ce_policyQualifiers_item,
{ "Item[##]", "x509ce.policyQualifiers_item",
{ "Item", "x509ce.policyQualifiers_item",
FT_NONE, BASE_NONE, NULL, 0,
"PolicyInformation/policyQualifiers/_item", HFILL }},
{ &hf_x509ce_PolicyMappingsSyntax_item,
{ "Item[##]", "x509ce.PolicyMappingsSyntax_item",
{ "Item", "x509ce.PolicyMappingsSyntax_item",
FT_NONE, BASE_NONE, NULL, 0,
"PolicyMappingsSyntax/_item", HFILL }},
{ &hf_x509ce_issuerDomainPolicy,
@ -1401,7 +1401,7 @@ void proto_register_x509ce(void) {
FT_STRING, BASE_NONE, NULL, 0,
"PolicyMappingsSyntax/_item/subjectDomainPolicy", HFILL }},
{ &hf_x509ce_GeneralNames_item,
{ "Item[##]", "x509ce.GeneralNames_item",
{ "Item", "x509ce.GeneralNames_item",
FT_UINT32, BASE_DEC, VALS(GeneralName_vals), 0,
"GeneralNames/_item", HFILL }},
{ &hf_x509ce_rfc822Name,
@ -1441,7 +1441,7 @@ void proto_register_x509ce(void) {
FT_NONE, BASE_NONE, NULL, 0,
"EDIPartyName/partyName", HFILL }},
{ &hf_x509ce_AttributesSyntax_item,
{ "Item[##]", "x509ce.AttributesSyntax_item",
{ "Item", "x509ce.AttributesSyntax_item",
FT_NONE, BASE_NONE, NULL, 0,
"AttributesSyntax/_item", HFILL }},
{ &hf_x509ce_cA,
@ -1461,7 +1461,7 @@ void proto_register_x509ce(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"NameConstraintsSyntax/excludedSubtrees", HFILL }},
{ &hf_x509ce_GeneralSubtrees_item,
{ "Item[##]", "x509ce.GeneralSubtrees_item",
{ "Item", "x509ce.GeneralSubtrees_item",
FT_NONE, BASE_NONE, NULL, 0,
"GeneralSubtrees/_item", HFILL }},
{ &hf_x509ce_base,
@ -1485,7 +1485,7 @@ void proto_register_x509ce(void) {
FT_UINT32, BASE_DEC, NULL, 0,
"PolicyConstraintsSyntax/inhibitPolicyMapping", HFILL }},
{ &hf_x509ce_CRLScopeSyntax_item,
{ "Item[##]", "x509ce.CRLScopeSyntax_item",
{ "Item", "x509ce.CRLScopeSyntax_item",
FT_NONE, BASE_NONE, NULL, 0,
"CRLScopeSyntax/_item", HFILL }},
{ &hf_x509ce_authorityName,
@ -1545,7 +1545,7 @@ void proto_register_x509ce(void) {
FT_STRING, BASE_NONE, NULL, 0,
"BaseRevocationInfo/baseThisUpdate", HFILL }},
{ &hf_x509ce_StatusReferrals_item,
{ "Item[##]", "x509ce.StatusReferrals_item",
{ "Item", "x509ce.StatusReferrals_item",
FT_UINT32, BASE_DEC, VALS(StatusReferral_vals), 0,
"StatusReferrals/_item", HFILL }},
{ &hf_x509ce_cRLReferral,
@ -1589,7 +1589,7 @@ void proto_register_x509ce(void) {
FT_STRING, BASE_NONE, NULL, 0,
"DeltaInformation/nextDelta", HFILL }},
{ &hf_x509ce_CRLDistPointsSyntax_item,
{ "Item[##]", "x509ce.CRLDistPointsSyntax_item",
{ "Item", "x509ce.CRLDistPointsSyntax_item",
FT_NONE, BASE_NONE, NULL, 0,
"CRLDistPointsSyntax/_item", HFILL }},
{ &hf_x509ce_reasons,

2
epan/dissectors/packet-x509ce.h
View File

@ -8,7 +8,7 @@
/* packet-x509ce.h
* Routines for X.509 Certificate Extensions packet dissection
*
* $Id: packet-x509ce-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
* $Id: packet-x509ce-template.h 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>

47
epan/dissectors/packet-x509if.c
View File

@ -1,15 +1,14 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if.c */
/* ./packet-x509if.c */
/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
/* Input file: packet-x509if-template.c */
/* Include files: packet-x509if-hf.c, packet-x509if-ett.c, packet-x509if-fn.c, packet-x509if-hfarr.c, packet-x509if-ettarr.c, packet-x509if-val.h */
/* packet-x509if.c
* Routines for X.509 Information Framework packet dissection
*
* $Id: packet-x509if-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
* $Id: packet-x509if-template.c 12245 2004-10-08 20:28:04Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -54,11 +53,6 @@ int hf_x509if_ATADV_attribute_id = -1;
/*--- Included file: packet-x509if-hf.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-hf.c */
/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
static int hf_x509if_rdnSequence = -1; /* RDNSequence */
static int hf_x509if_RDNSequence_item = -1; /* RelativeDistinguishedName */
static int hf_x509if_RelativeDistinguishedName_item = -1; /* AttributeTypeAndDistinguishedValue */
@ -75,11 +69,6 @@ static gint ett_x509if_Attribute = -1;
/*--- Included file: packet-x509if-ett.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-ett.c */
/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
static gint ett_x509if_Name = -1;
static gint ett_x509if_RDNSequence = -1;
static gint ett_x509if_RelativeDistinguishedName = -1;
@ -90,7 +79,7 @@ static gint ett_x509if_AllowedSubset = -1;
static ber_sequence Attribute_sequence[] = {
static const ber_sequence Attribute_sequence[] = {
/* { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_x509if_type },*/
/*XXX missing stuff here */
{ 0, 0, 0, NULL }
@ -121,7 +110,7 @@ dissect_hf_x509if_ATADV_attribute_value(packet_info *pinfo, proto_tree *tree, tv
return offset;
}
static ber_sequence AttributeTypeAndDistinguishedValue_sequence[] = {
static const ber_sequence AttributeTypeAndDistinguishedValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_hf_x509if_ATADV_attribute_id },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_hf_x509if_ATADV_attribute_value },
/*XXX missing stuff here */
@ -139,10 +128,8 @@ dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag, tvbuff_
/*--- Included file: packet-x509if-fn.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-fn.c */
/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
/*--- Fields for imported types ---*/
static int
@ -165,7 +152,7 @@ static int dissect_RelativeDistinguishedName_item(packet_info *pinfo, proto_tree
return dissect_x509if_AttributeTypeAndDistinguishedValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_RelativeDistinguishedName_item);
}
static ber_sequence RelativeDistinguishedName_set_of[1] = {
static const ber_sequence RelativeDistinguishedName_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item },
};
@ -180,7 +167,7 @@ static int dissect_RDNSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_RelativeDistinguishedName(FALSE, tvb, offset, pinfo, tree, hf_x509if_RDNSequence_item);
}
static ber_sequence RDNSequence_sequence_of[1] = {
static const ber_sequence RDNSequence_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item },
};
@ -201,7 +188,7 @@ const value_string Name_vals[] = {
{ 0, NULL }
};
static ber_choice Name_choice[] = {
static const ber_choice Name_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_rdnSequence },
{ 0, 0, 0, 0, NULL }
};
@ -238,7 +225,7 @@ dissect_x509if_ObjectClassKind(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
return offset;
}
static asn_namedbit AllowedSubset_bits[] = {
static const asn_namedbit AllowedSubset_bits[] = {
{ 0, &hf_x509if_AllowedSubset_baseObject, -1, -1, NULL, NULL },
{ 1, &hf_x509if_AllowedSubset_oneLevel, -1, -1, NULL, NULL },
{ 2, &hf_x509if_AllowedSubset_wholeSubtree, -1, -1, NULL, NULL },
@ -287,21 +274,16 @@ void proto_register_x509if(void) {
/*--- Included file: packet-x509if-hfarr.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-hfarr.c */
/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
{ &hf_x509if_rdnSequence,
{ "rdnSequence", "x509if.rdnSequence",
FT_UINT32, BASE_DEC, NULL, 0,
"Name/rdnSequence", HFILL }},
{ &hf_x509if_RDNSequence_item,
{ "Item[##]", "x509if.RDNSequence_item",
{ "Item", "x509if.RDNSequence_item",
FT_UINT32, BASE_DEC, NULL, 0,
"RDNSequence/_item", HFILL }},
{ &hf_x509if_RelativeDistinguishedName_item,
{ "Item(##)", "x509if.RelativeDistinguishedName_item",
{ "Item", "x509if.RelativeDistinguishedName_item",
FT_NONE, BASE_NONE, NULL, 0,
"RelativeDistinguishedName/_item", HFILL }},
{ &hf_x509if_AllowedSubset_baseObject,
@ -327,11 +309,6 @@ void proto_register_x509if(void) {
/*--- Included file: packet-x509if-ettarr.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-ettarr.c */
/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
&ett_x509if_Name,
&ett_x509if_RDNSequence,
&ett_x509if_RelativeDistinguishedName,

10
epan/dissectors/packet-x509if.h
View File

@ -1,15 +1,14 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if.h */
/* ./packet-x509if.h */
/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
/* Input file: packet-x509if-template.h */
/* Include files: packet-x509if-exp.h, packet-x509if-valexp.h */
/* packet-x509if.h
* Routines for X.509 Information Framework packet dissection
*
* $Id: packet-x509if-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
* $Id: packet-x509if-template.h 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -36,11 +35,6 @@
/*--- Included file: packet-x509if-exp.h ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509if-exp.h */
/* ../../tools/asn2eth.py -X -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn */
extern const value_string Name_vals[];
int dissect_x509if_AttributeType(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
int dissect_x509if_Name(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);

34
epan/dissectors/packet-x509sat.c
View File

@ -1,15 +1,14 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509sat.c */
/* ./packet-x509sat.c */
/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
/* Input file: packet-x509sat-template.c */
/* Include files: packet-x509sat-hf.c, packet-x509sat-ett.c, packet-x509sat-fn.c, packet-x509sat-hfarr.c, packet-x509sat-ettarr.c, packet-x509sat-val.h */
/* packet-x509sat.c
* Routines for X.509 Selected Attribute Types packet dissection
*
* $Id: packet-x509sat-template.c,v 1.2 2004/05/25 21:07:43 guy Exp $
* $Id: packet-x509sat-template.c 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -89,11 +88,6 @@ int hf_x509sat_id_at_collectiveTelephoneNumber = -1;
/*--- Included file: packet-x509sat-hf.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509sat-hf.c */
/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
static int hf_x509sat_equality = -1; /* AttributeType */
static int hf_x509sat_substrings = -1; /* AttributeType */
static int hf_x509sat_greaterOrEqual = -1; /* AttributeType */
@ -111,11 +105,6 @@ static gint ett_x509sat_DirectoryString = -1;
/*--- Included file: packet-x509sat-ett.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509sat-ett.c */
/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
static gint ett_x509sat_CriteriaItem = -1;
static gint ett_x509sat_TelexNumber = -1;
@ -125,11 +114,6 @@ static gint ett_x509sat_TelexNumber = -1;
/*--- Included file: packet-x509sat-fn.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509sat-fn.c */
/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
/*--- Fields for imported types ---*/
static int dissect_equality(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
@ -178,7 +162,7 @@ static const value_string CriteriaItem_vals[] = {
{ 0, NULL }
};
static ber_choice CriteriaItem_choice[] = {
static const ber_choice CriteriaItem_choice[] = {
{ 0, BER_CLASS_CON, 0, 0, dissect_equality },
{ 1, BER_CLASS_CON, 1, 0, dissect_substrings },
{ 2, BER_CLASS_CON, 2, 0, dissect_greaterOrEqual },
@ -224,7 +208,7 @@ static int dissect_answerback(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509sat_PrintableString(FALSE, tvb, offset, pinfo, tree, hf_x509sat_answerback);
}
static ber_sequence TelexNumber_sequence[] = {
static const ber_sequence TelexNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telexNumber },
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_countryCode },
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_answerback },
@ -655,11 +639,6 @@ void proto_register_x509sat(void) {
/*--- Included file: packet-x509sat-hfarr.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509sat-hfarr.c */
/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
{ &hf_x509sat_equality,
{ "equality", "x509sat.equality",
FT_NONE, BASE_NONE, NULL, 0,
@ -703,11 +682,6 @@ void proto_register_x509sat(void) {
/*--- Included file: packet-x509sat-ettarr.c ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509sat-ettarr.c */
/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
&ett_x509sat_CriteriaItem,
&ett_x509sat_TelexNumber,

10
epan/dissectors/packet-x509sat.h
View File

@ -1,15 +1,14 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509sat.h */
/* ./packet-x509sat.h */
/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
/* Input file: packet-x509sat-template.h */
/* Include files: packet-x509sat-exp.h, packet-x509sat-valexp.h */
/* packet-x509sat.h
* Routines for X.509 Selected Attribute Types packet dissection
*
* $Id: packet-x509sat-template.h,v 1.1 2004/05/24 08:42:29 sahlberg Exp $
* $Id: packet-x509sat-template.h 12203 2004-10-05 09:18:55Z guy $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -36,11 +35,6 @@
/*--- Included file: packet-x509sat-exp.h ---*/
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* packet-x509sat-exp.h */
/* ../../tools/asn2eth.py -X -b -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
int dissect_x509sat_UniqueIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
/*--- End of included file: packet-x509sat-exp.h ---*/