osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Regenerate dissectors with the current asn2eth. 

svn path=/trunk/; revision=15664
This commit is contained in:
Guy Harris 2005-09-02 05:43:49 +00:00
parent b9c5fe14d6
commit 92e0e21362
33 changed files with 1637 additions and 892 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/cms/cms-exp.cnf
View File

@ -6,7 +6,7 @@ DigestAlgorithmIdentifiers BER_CLASS_UNI BER_UNI_TAG_SET
SignerInfos BER_CLASS_UNI BER_UNI_TAG_SET
EncapsulatedContentInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
SignerInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
SignerIdentifier -1/*choice*/ -1/*choice*/
SignerIdentifier BER_CLASS_ANY/*choice*/ -1/*choice*/
SignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET
UnsignedAttributes BER_CLASS_UNI BER_UNI_TAG_SET
SignatureValue BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING

2
asn1/mms/mms-exp.cnf
View File

@ -1,5 +1,5 @@
#.IMPORT_TAG
MMSpdu BER_CLASS_CON -1/*choice*/
MMSpdu BER_CLASS_ANY/*choice*/ -1/*choice*/
#.END
#.TYPE_ATTR

4
asn1/pkixcmp/cmp-exp.cnf
View File

@ -2,7 +2,7 @@
PKIMessage BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PKIHeader BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PKIFreeText BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PKIBody BER_CLASS_CON -1/*choice*/
PKIBody BER_CLASS_ANY/*choice*/ -1/*choice*/
PKIProtection BER_CLASS_UNI BER_UNI_TAG_BITSTRING
ProtectedPart BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PasswordBasedMac BER_CLASS_UNI BER_UNI_TAG_OID
@ -21,7 +21,7 @@ POPODecKeyRespContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
CertRepMessage BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
CertResponse BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
CertifiedKeyPair BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
CertOrEncCert BER_CLASS_CON -1/*choice*/
CertOrEncCert BER_CLASS_ANY/*choice*/ -1/*choice*/
KeyRecRepContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
RevReqContent BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
RevDetails BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

8
asn1/pkixcrmf/crmf-exp.cnf
View File

@ -6,19 +6,19 @@ CertTemplate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
OptionalValidity BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Controls BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
AttributeTypeAndValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
ProofOfPossession BER_CLASS_CON -1/*choice*/
ProofOfPossession BER_CLASS_ANY/*choice*/ -1/*choice*/
POPOSigningKey BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
POPOSigningKeyInput BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PKMACValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PBMParameter BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
POPOPrivKey BER_CLASS_CON -1/*choice*/
POPOPrivKey BER_CLASS_ANY/*choice*/ -1/*choice*/
SubsequentMessage BER_CLASS_UNI BER_UNI_TAG_INTEGER
RegToken BER_CLASS_UNI BER_UNI_TAG_UTF8String
Authenticator BER_CLASS_UNI BER_UNI_TAG_UTF8String
PKIPublicationInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
SinglePubInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PKIArchiveOptions BER_CLASS_CON -1/*choice*/
EncryptedKey -1/*choice*/ -1/*choice*/
PKIArchiveOptions BER_CLASS_ANY/*choice*/ -1/*choice*/
EncryptedKey BER_CLASS_ANY/*choice*/ -1/*choice*/
EncryptedValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
KeyGenParameters BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
OldCertId BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

2
asn1/x509af/x509af-exp.cnf
View File

@ -5,7 +5,7 @@ CertificateSerialNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER
AlgorithmIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Validity BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
SubjectPublicKeyInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Time BER_CLASS_UNI -1/*choice*/
Time BER_CLASS_ANY/*choice*/ -1/*choice*/
Extensions BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Extension BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Certificates BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

8
asn1/x509ce/x509ce-exp.cnf
View File

@ -11,7 +11,7 @@ PolicyInformation BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PolicyQualifierInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PolicyMappingsSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
GeneralNames BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
GeneralName BER_CLASS_CON -1/*choice*/
GeneralName BER_CLASS_ANY/*choice*/ -1/*choice*/
EDIPartyName BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
AttributesSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
BasicConstraintsSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
@ -30,7 +30,7 @@ OnlyCertificateTypes BER_CLASS_UNI BER_UNI_TAG_BITSTRING
NumberRange BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
BaseRevocationInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
StatusReferrals BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
StatusReferral BER_CLASS_CON -1/*choice*/
StatusReferral BER_CLASS_ANY/*choice*/ -1/*choice*/
CRLReferral BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
DeltaRefInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
CRLStreamIdentifier BER_CLASS_UNI BER_UNI_TAG_INTEGER
@ -38,13 +38,13 @@ OrderedListSyntax BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
DeltaInformation BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
CRLDistPointsSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
DistributionPoint BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
DistributionPointName BER_CLASS_CON -1/*choice*/
DistributionPointName BER_CLASS_ANY/*choice*/ -1/*choice*/
ReasonFlags BER_CLASS_UNI BER_UNI_TAG_BITSTRING
IssuingDistPointSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
BaseCRLNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER
CertificateExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
CertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
AltNameType BER_CLASS_UNI -1/*choice*/
AltNameType BER_CLASS_ANY/*choice*/ -1/*choice*/
CertPolicySet BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
CertificatePairExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
CertificatePairAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

10
asn1/x509if/x509if-exp.cnf
View File

@ -5,7 +5,7 @@ Context BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
AttributeValueAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
ContextAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
AttributeTypeAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Name BER_CLASS_UNI -1/*choice*/
Name BER_CLASS_ANY/*choice*/ -1/*choice*/
RDNSequence BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
DistinguishedName BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
RelativeDistinguishedName BER_CLASS_UNI BER_UNI_TAG_SET
@ -14,7 +14,7 @@ SubtreeSpecification BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
LocalName BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
ChopSpecification BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
BaseDistance BER_CLASS_UNI BER_UNI_TAG_INTEGER
Refinement BER_CLASS_CON -1/*choice*/
Refinement BER_CLASS_ANY/*choice*/ -1/*choice*/
AttributeUsage BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
DITStructureRule BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
RuleIdentifier BER_CLASS_UNI BER_UNI_TAG_INTEGER
@ -27,11 +27,11 @@ AllowedSubset BER_CLASS_UNI BER_UNI_TAG_BITSTRING
ImposedSubset BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
RequestAttribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
ContextProfile BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
ContextCombination BER_CLASS_CON -1/*choice*/
ContextCombination BER_CLASS_ANY/*choice*/ -1/*choice*/
MatchingUse BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
AttributeCombination BER_CLASS_CON -1/*choice*/
AttributeCombination BER_CLASS_ANY/*choice*/ -1/*choice*/
ResultAttribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
OutputValues BER_CLASS_UNI -1/*choice*/
OutputValues BER_CLASS_ANY/*choice*/ -1/*choice*/
ControlOptions BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
EntryLimit BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
RelaxationPolicy BER_CLASS_UNI BER_UNI_TAG_SEQUENCE

10
asn1/x509sat/x509sat-exp.cnf
View File

@ -2,7 +2,7 @@
DirectoryString BER_CLASS_UNI BER_UNI_TAG_PrintableString
UniqueIdentifier BER_CLASS_UNI BER_UNI_TAG_BITSTRING
CountryName BER_CLASS_UNI BER_UNI_TAG_PrintableString
Criteria BER_CLASS_CON -1/*choice*/
Criteria BER_CLASS_ANY/*choice*/ -1/*choice*/
EnhancedGuide BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PostalAddress BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
FacsimileTelephoneNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
@ -22,13 +22,13 @@ ZonalResult BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
LanguageContextSyntax BER_CLASS_UNI BER_UNI_TAG_PrintableString
TimeSpecification BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Period BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
XDayOf BER_CLASS_CON -1/*choice*/
NamedDay BER_CLASS_UNI -1/*choice*/
XDayOf BER_CLASS_ANY/*choice*/ -1/*choice*/
NamedDay BER_CLASS_ANY/*choice*/ -1/*choice*/
DayTimeBand BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
DayTime BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
TimeZone BER_CLASS_UNI BER_UNI_TAG_INTEGER
TimeAssertion BER_CLASS_UNI -1/*choice*/
LocaleContextSyntax BER_CLASS_UNI -1/*choice*/
TimeAssertion BER_CLASS_ANY/*choice*/ -1/*choice*/
LocaleContextSyntax BER_CLASS_ANY/*choice*/ -1/*choice*/
#.END
#.TYPE_ATTR

31
epan/dissectors/packet-MAP_DialoguePDU.c
View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* .\packet-MAP_DialoguePDU.c */
/* ./packet-MAP_DialoguePDU.c */
/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
/* Input file: packet-MAP-DialoguePDU-template.c */
@ -114,6 +114,7 @@ static int dissect_protectedPayload(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_gsm_map_ProtectedPayload(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_protectedPayload);
}
static const ber_sequence_t MAP_OpenInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_destinationReference_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originationReference_impl },
@ -124,7 +125,7 @@ static const ber_sequence_t MAP_OpenInfo_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_OpenInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MAP_OpenInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_OpenInfo);
MAP_OpenInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_OpenInfo);
return offset;
}
@ -132,6 +133,7 @@ static int dissect_map_open_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_MAP_DialoguePDU_MAP_OpenInfo(TRUE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_open);
}
static const ber_sequence_t MAP_AcceptInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
{ 0, 0, 0, NULL }
@ -140,7 +142,7 @@ static const ber_sequence_t MAP_AcceptInfo_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_AcceptInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MAP_AcceptInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_AcceptInfo);
MAP_AcceptInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_AcceptInfo);
return offset;
}
@ -148,6 +150,7 @@ static int dissect_map_accept_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_MAP_DialoguePDU_MAP_AcceptInfo(TRUE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_accept);
}
static const ber_sequence_t MAP_CloseInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
{ 0, 0, 0, NULL }
@ -156,7 +159,7 @@ static const ber_sequence_t MAP_CloseInfo_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_CloseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MAP_CloseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_CloseInfo);
MAP_CloseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_CloseInfo);
return offset;
}
@ -202,6 +205,7 @@ static int dissect_encapsulatedAC(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_MAP_DialoguePDU_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_encapsulatedAC);
}
static const ber_sequence_t MAP_RefuseInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_reason },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@ -212,7 +216,7 @@ static const ber_sequence_t MAP_RefuseInfo_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_RefuseInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MAP_RefuseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_RefuseInfo);
MAP_RefuseInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_RefuseInfo);
return offset;
}
@ -298,7 +302,8 @@ static const ber_choice_t MAP_UserAbortChoice_choice[] = {
static int
dissect_MAP_DialoguePDU_MAP_UserAbortChoice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice, NULL);
MAP_UserAbortChoice_choice, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortChoice,
NULL);
return offset;
}
@ -306,8 +311,9 @@ static int dissect_map_UserAbortChoice(packet_info *pinfo, proto_tree *tree, tvb
return dissect_MAP_DialoguePDU_MAP_UserAbortChoice(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_UserAbortChoice);
}
static const ber_sequence_t MAP_UserAbortInfo_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_map_UserAbortChoice },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_map_UserAbortChoice },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
{ 0, 0, 0, NULL }
};
@ -315,7 +321,7 @@ static const ber_sequence_t MAP_UserAbortInfo_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_UserAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MAP_UserAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortInfo);
MAP_UserAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_UserAbortInfo);
return offset;
}
@ -342,6 +348,7 @@ static int dissect_map_ProviderAbortReason(packet_info *pinfo, proto_tree *tree,
return dissect_MAP_DialoguePDU_MAP_ProviderAbortReason(FALSE, tvb, offset, pinfo, tree, hf_MAP_DialoguePDU_map_ProviderAbortReason);
}
static const ber_sequence_t MAP_ProviderAbortInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_map_ProviderAbortReason },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_extensionContainer },
@ -351,7 +358,7 @@ static const ber_sequence_t MAP_ProviderAbortInfo_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_ProviderAbortInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MAP_ProviderAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProviderAbortInfo);
MAP_ProviderAbortInfo_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProviderAbortInfo);
return offset;
}
@ -383,11 +390,13 @@ static const ber_choice_t MAP_DialoguePDU_choice[] = {
static int
dissect_MAP_DialoguePDU_MAP_DialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU, NULL);
MAP_DialoguePDU_choice, hf_index, ett_MAP_DialoguePDU_MAP_DialoguePDU,
NULL);
return offset;
}
static const ber_sequence_t MAP_ProtectedDialoguePDU_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_encapsulatedAC },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_securityHeader },
@ -398,7 +407,7 @@ static const ber_sequence_t MAP_ProtectedDialoguePDU_sequence[] = {
static int
dissect_MAP_DialoguePDU_MAP_ProtectedDialoguePDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MAP_ProtectedDialoguePDU_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProtectedDialoguePDU);
MAP_ProtectedDialoguePDU_sequence, hf_index, ett_MAP_DialoguePDU_MAP_ProtectedDialoguePDU);
return offset;
}

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

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* .\packet-MAP_DialoguePDU.h */
/* ./packet-MAP_DialoguePDU.h */
/* ../../tools/asn2eth.py -X -b -e -p MAP_DialoguePDU -c MAP_DialoguePDU.cnf -s packet-MAP-DialoguePDU-template MAP_DialoguePDU.asn */
/* Input file: packet-MAP-DialoguePDU-template.h */

6
epan/dissectors/packet-acse.c
View File

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* .\packet-acse.c */
/* ./packet-acse.c */
/* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
/* Input file: packet-acse-template.c */
@ -540,7 +540,7 @@ const value_string acse_AP_title_vals[] = {
};
static const ber_choice_t AP_title_choice[] = {
{ 0, BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ap_title_form1 },
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ap_title_form1 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ap_title_form2 },
{ 2, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 },
{ 3, BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_ap_title_form3 },
@ -1811,7 +1811,7 @@ static const value_string acse_AE_title_vals[] = {
};
static const ber_choice_t AE_title_choice[] = {
{ 0, BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ae_title_form1 },
{ 0, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_ae_title_form1 },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ae_title_form2 },
{ 0, 0, 0, 0, NULL }
};

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

@ -1,6 +1,6 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* .\packet-acse.h */
/* ./packet-acse.h */
/* ../../tools/asn2eth.py -X -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn */
/* Input file: packet-acse-template.h */

100
epan/dissectors/packet-cmp.c
View File

@ -355,6 +355,7 @@ static int dissect_pvno(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
}
static int
dissect_cmp_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -403,11 +404,12 @@ static int dissect_rspInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
}
static int
dissect_cmp_UTF8String(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, BER_UNI_TAG_UTF8String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -464,6 +466,7 @@ static int dissect_infoValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_cmp_T_infoValue(FALSE, tvb, offset, pinfo, tree, hf_cmp_infoValue);
}
static const ber_sequence_t InfoTypeAndValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_infoType },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_infoValue },
@ -473,7 +476,7 @@ static const ber_sequence_t InfoTypeAndValue_sequence[] = {
int
dissect_cmp_InfoTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
InfoTypeAndValue_sequence, hf_index, ett_cmp_InfoTypeAndValue);
InfoTypeAndValue_sequence, hf_index, ett_cmp_InfoTypeAndValue);
return offset;
}
@ -503,6 +506,7 @@ static int dissect_generalInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_cmp_generalInfo);
}
static const ber_sequence_t PKIHeader_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pvno },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_sender },
@ -522,7 +526,7 @@ static const ber_sequence_t PKIHeader_sequence[] = {
int
dissect_cmp_PKIHeader(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PKIHeader_sequence, hf_index, ett_cmp_PKIHeader);
PKIHeader_sequence, hf_index, ett_cmp_PKIHeader);
return offset;
}
@ -598,6 +602,7 @@ static int dissect_status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_cmp_PKIStatus(FALSE, tvb, offset, pinfo, tree, hf_cmp_status);
}
static const asn_namedbit PKIFailureInfo_bits[] = {
{ 0, &hf_cmp_PKIFailureInfo_badAlg, -1, -1, "badAlg", NULL },
{ 1, &hf_cmp_PKIFailureInfo_badMessageCheck, -1, -1, "badMessageCheck", NULL },
@ -615,8 +620,8 @@ static const asn_namedbit PKIFailureInfo_bits[] = {
int
dissect_cmp_PKIFailureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
PKIFailureInfo_bits, hf_index, ett_cmp_PKIFailureInfo,
NULL);
PKIFailureInfo_bits, hf_index, ett_cmp_PKIFailureInfo,
NULL);
return offset;
}
@ -624,6 +629,7 @@ static int dissect_failInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cmp_PKIFailureInfo(FALSE, tvb, offset, pinfo, tree, hf_cmp_failInfo);
}
static const ber_sequence_t PKIStatusInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_status },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_statusString },
@ -634,7 +640,7 @@ static const ber_sequence_t PKIStatusInfo_sequence[] = {
int
dissect_cmp_PKIStatusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PKIStatusInfo_sequence, hf_index, ett_cmp_PKIStatusInfo);
PKIStatusInfo_sequence, hf_index, ett_cmp_PKIStatusInfo);
return offset;
}
@ -664,7 +670,8 @@ static const ber_choice_t CertOrEncCert_choice[] = {
int
dissect_cmp_CertOrEncCert(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert, NULL);
CertOrEncCert_choice, hf_index, ett_cmp_CertOrEncCert,
NULL);
return offset;
}
@ -672,8 +679,9 @@ static int dissect_certOrEncCert(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_cmp_CertOrEncCert(FALSE, tvb, offset, pinfo, tree, hf_cmp_certOrEncCert);
}
static const ber_sequence_t CertifiedKeyPair_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certOrEncCert },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certOrEncCert },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_privateKey },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_publicationInfo },
{ 0, 0, 0, NULL }
@ -682,7 +690,7 @@ static const ber_sequence_t CertifiedKeyPair_sequence[] = {
int
dissect_cmp_CertifiedKeyPair(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertifiedKeyPair_sequence, hf_index, ett_cmp_CertifiedKeyPair);
CertifiedKeyPair_sequence, hf_index, ett_cmp_CertifiedKeyPair);
return offset;
}
@ -693,6 +701,7 @@ static int dissect_keyPairHist_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_cmp_CertifiedKeyPair(FALSE, tvb, offset, pinfo, tree, hf_cmp_keyPairHist_item);
}
static const ber_sequence_t CertResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_certReqId },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status1 },
@ -704,7 +713,7 @@ static const ber_sequence_t CertResponse_sequence[] = {
int
dissect_cmp_CertResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertResponse_sequence, hf_index, ett_cmp_CertResponse);
CertResponse_sequence, hf_index, ett_cmp_CertResponse);
return offset;
}
@ -728,6 +737,7 @@ static int dissect_response(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cmp_SEQUENCE_OF_CertResponse(FALSE, tvb, offset, pinfo, tree, hf_cmp_response);
}
static const ber_sequence_t CertRepMessage_sequence[] = {
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_caPubs },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_response },
@ -737,7 +747,7 @@ static const ber_sequence_t CertRepMessage_sequence[] = {
int
dissect_cmp_CertRepMessage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertRepMessage_sequence, hf_index, ett_cmp_CertRepMessage);
CertRepMessage_sequence, hf_index, ett_cmp_CertRepMessage);
return offset;
}
@ -754,6 +764,7 @@ static int dissect_ccp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_cmp_CertRepMessage(FALSE, tvb, offset, pinfo, tree, hf_cmp_ccp);
}
static const ber_sequence_t Challenge_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_owf },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_witness },
@ -764,7 +775,7 @@ static const ber_sequence_t Challenge_sequence[] = {
int
dissect_cmp_Challenge(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Challenge_sequence, hf_index, ett_cmp_Challenge);
Challenge_sequence, hf_index, ett_cmp_Challenge);
return offset;
}
@ -820,6 +831,7 @@ static int dissect_keyPairHist(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair(FALSE, tvb, offset, pinfo, tree, hf_cmp_keyPairHist);
}
static const ber_sequence_t KeyRecRepContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status1 },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_newSigCert },
@ -831,7 +843,7 @@ static const ber_sequence_t KeyRecRepContent_sequence[] = {
int
dissect_cmp_KeyRecRepContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
KeyRecRepContent_sequence, hf_index, ett_cmp_KeyRecRepContent);
KeyRecRepContent_sequence, hf_index, ett_cmp_KeyRecRepContent);
return offset;
}
@ -839,6 +851,7 @@ static int dissect_krp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_cmp_KeyRecRepContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_krp);
}
static const ber_sequence_t RevDetails_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certDetails },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_revocationReason },
@ -850,7 +863,7 @@ static const ber_sequence_t RevDetails_sequence[] = {
int
dissect_cmp_RevDetails(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RevDetails_sequence, hf_index, ett_cmp_RevDetails);
RevDetails_sequence, hf_index, ett_cmp_RevDetails);
return offset;
}
@ -922,6 +935,7 @@ static int dissect_crls(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_cmp_SEQUENCE_SIZE_1_MAX_OF_CertificateList(FALSE, tvb, offset, pinfo, tree, hf_cmp_crls);
}
static const ber_sequence_t RevRepContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status2 },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_revCerts },
@ -932,7 +946,7 @@ static const ber_sequence_t RevRepContent_sequence[] = {
int
dissect_cmp_RevRepContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RevRepContent_sequence, hf_index, ett_cmp_RevRepContent);
RevRepContent_sequence, hf_index, ett_cmp_RevRepContent);
return offset;
}
@ -940,6 +954,7 @@ static int dissect_rp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
return dissect_cmp_RevRepContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_rp);
}
static const ber_sequence_t CAKeyUpdAnnContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_oldWithNew },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_newWithOld },
@ -950,7 +965,7 @@ static const ber_sequence_t CAKeyUpdAnnContent_sequence[] = {
int
dissect_cmp_CAKeyUpdAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CAKeyUpdAnnContent_sequence, hf_index, ett_cmp_CAKeyUpdAnnContent);
CAKeyUpdAnnContent_sequence, hf_index, ett_cmp_CAKeyUpdAnnContent);
return offset;
}
@ -959,6 +974,7 @@ static int dissect_ckuann(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
}
int
dissect_cmp_CertAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_pkix1explicit_Certificate(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -969,6 +985,7 @@ static int dissect_cann(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_cmp_CertAnnContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_cann);
}
static const ber_sequence_t RevAnnContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_status },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certId },
@ -981,7 +998,7 @@ static const ber_sequence_t RevAnnContent_sequence[] = {
int
dissect_cmp_RevAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RevAnnContent_sequence, hf_index, ett_cmp_RevAnnContent);
RevAnnContent_sequence, hf_index, ett_cmp_RevAnnContent);
return offset;
}
@ -1018,6 +1035,7 @@ static int dissect_conf(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
}
int
dissect_cmp_NestedMessageContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_cmp_PKIMessage(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -1060,6 +1078,7 @@ static int dissect_genp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_cmp_GenRepContent(FALSE, tvb, offset, pinfo, tree, hf_cmp_genp);
}
static const ber_sequence_t ErrorMsgContent_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_pKIStatusInfo },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_errorCode },
@ -1070,7 +1089,7 @@ static const ber_sequence_t ErrorMsgContent_sequence[] = {
int
dissect_cmp_ErrorMsgContent(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ErrorMsgContent_sequence, hf_index, ett_cmp_ErrorMsgContent);
ErrorMsgContent_sequence, hf_index, ett_cmp_ErrorMsgContent);
return offset;
}
@ -1136,7 +1155,8 @@ static const ber_choice_t PKIBody_choice[] = {
int
dissect_cmp_PKIBody(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
PKIBody_choice, hf_index, ett_cmp_PKIBody, NULL);
PKIBody_choice, hf_index, ett_cmp_PKIBody,
NULL);
return offset;
}
@ -1145,11 +1165,12 @@ static int dissect_body(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
}
int
dissect_cmp_PKIProtection(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -1157,9 +1178,10 @@ static int dissect_protection(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_cmp_PKIProtection(FALSE, tvb, offset, pinfo, tree, hf_cmp_protection);
}
static const ber_sequence_t PKIMessage_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_header },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_protection },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_extraCerts },
{ 0, 0, 0, NULL }
@ -1168,21 +1190,22 @@ static const ber_sequence_t PKIMessage_sequence[] = {
int
dissect_cmp_PKIMessage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PKIMessage_sequence, hf_index, ett_cmp_PKIMessage);
PKIMessage_sequence, hf_index, ett_cmp_PKIMessage);
return offset;
}
static const ber_sequence_t ProtectedPart_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_header },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_body },
{ 0, 0, 0, NULL }
};
int
dissect_cmp_ProtectedPart(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ProtectedPart_sequence, hf_index, ett_cmp_ProtectedPart);
ProtectedPart_sequence, hf_index, ett_cmp_ProtectedPart);
return offset;
}
@ -1197,6 +1220,7 @@ dissect_cmp_PasswordBasedMac(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
return offset;
}
static const ber_sequence_t PBMParameter_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_salt },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf },
@ -1208,7 +1232,7 @@ static const ber_sequence_t PBMParameter_sequence[] = {
int
dissect_cmp_PBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PBMParameter_sequence, hf_index, ett_cmp_PBMParameter);
PBMParameter_sequence, hf_index, ett_cmp_PBMParameter);
return offset;
}
@ -1223,6 +1247,7 @@ dissect_cmp_DHBasedMac(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
return offset;
}
static const ber_sequence_t DHBMParameter_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mac },
@ -1232,12 +1257,13 @@ static const ber_sequence_t DHBMParameter_sequence[] = {
int
dissect_cmp_DHBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DHBMParameter_sequence, hf_index, ett_cmp_DHBMParameter);
DHBMParameter_sequence, hf_index, ett_cmp_DHBMParameter);
return offset;
}
int
dissect_cmp_OOBCert(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_pkix1explicit_Certificate(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -1246,11 +1272,12 @@ dissect_cmp_OOBCert(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet
}
static int
dissect_cmp_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -1258,6 +1285,7 @@ static int dissect_hashVal(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cmp_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_cmp_hashVal);
}
static const ber_sequence_t OOBCertHash_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_hashAlg },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_certId },
@ -1268,7 +1296,7 @@ static const ber_sequence_t OOBCertHash_sequence[] = {
int
dissect_cmp_OOBCertHash(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
OOBCertHash_sequence, hf_index, ett_cmp_OOBCertHash);
OOBCertHash_sequence, hf_index, ett_cmp_OOBCertHash);
return offset;
}
@ -1391,7 +1419,7 @@ void proto_register_cmp(void) {
"PKIFreeText/_item", HFILL }},
{ &hf_cmp_ir,
{ "ir", "cmp.ir",
FT_NONE, BASE_NONE, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"PKIBody/ir", HFILL }},
{ &hf_cmp_ip,
{ "ip", "cmp.ip",
@ -1399,7 +1427,7 @@ void proto_register_cmp(void) {
"PKIBody/ip", HFILL }},
{ &hf_cmp_cr,
{ "cr", "cmp.cr",
FT_NONE, BASE_NONE, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"PKIBody/cr", HFILL }},
{ &hf_cmp_cp,
{ "cp", "cmp.cp",
@ -1415,7 +1443,7 @@ void proto_register_cmp(void) {
"PKIBody/popdecr", HFILL }},
{ &hf_cmp_kur,
{ "kur", "cmp.kur",
FT_NONE, BASE_NONE, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"PKIBody/kur", HFILL }},
{ &hf_cmp_kup,
{ "kup", "cmp.kup",
@ -1423,7 +1451,7 @@ void proto_register_cmp(void) {
"PKIBody/kup", HFILL }},
{ &hf_cmp_krr,
{ "krr", "cmp.krr",
FT_NONE, BASE_NONE, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"PKIBody/krr", HFILL }},
{ &hf_cmp_krp,
{ "krp", "cmp.krp",
@ -1439,7 +1467,7 @@ void proto_register_cmp(void) {
"PKIBody/rp", HFILL }},
{ &hf_cmp_ccr,
{ "ccr", "cmp.ccr",
FT_NONE, BASE_NONE, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"PKIBody/ccr", HFILL }},
{ &hf_cmp_ccp,
{ "ccp", "cmp.ccp",

115
epan/dissectors/packet-cms.c
View File

@ -226,6 +226,7 @@ static int dissect_contentType1(packet_info *pinfo, proto_tree *tree, tvbuff_t *
}
static int
dissect_cms_T_contentType(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,
@ -251,6 +252,7 @@ static int dissect_content(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cms_T_content(FALSE, tvb, offset, pinfo, tree, hf_cms_content);
}
static const ber_sequence_t ContentInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
{ BER_CLASS_CON, 0, 0, dissect_content },
@ -260,7 +262,7 @@ static const ber_sequence_t ContentInfo_sequence[] = {
int
dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ContentInfo_sequence, hf_index, ett_cms_ContentInfo);
ContentInfo_sequence, hf_index, ett_cms_ContentInfo);
return offset;
}
@ -288,6 +290,7 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
}
static int
dissect_cms_DigestAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -321,6 +324,7 @@ static int dissect_digestAlgorithms(packet_info *pinfo, proto_tree *tree, tvbuff
}
static int
dissect_cms_T_eContentType(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,
@ -357,6 +361,7 @@ static int dissect_eContent(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cms_T_eContent(FALSE, tvb, offset, pinfo, tree, hf_cms_eContent);
}
static const ber_sequence_t EncapsulatedContentInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_eContentType },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_eContent },
@ -366,7 +371,7 @@ static const ber_sequence_t EncapsulatedContentInfo_sequence[] = {
int
dissect_cms_EncapsulatedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
EncapsulatedContentInfo_sequence, hf_index, ett_cms_EncapsulatedContentInfo);
EncapsulatedContentInfo_sequence, hf_index, ett_cms_EncapsulatedContentInfo);
return offset;
}
@ -387,6 +392,7 @@ static int dissect_attrType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cms_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_cms_attrType);
}
static const ber_sequence_t Attribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attrType },
{ 0, 0, 0, NULL }
@ -395,7 +401,7 @@ static const ber_sequence_t Attribute_sequence[] = {
static int
dissect_cms_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Attribute_sequence, hf_index, ett_cms_Attribute);
Attribute_sequence, hf_index, ett_cms_Attribute);
return offset;
}
@ -434,6 +440,7 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_cms_UnauthAttributes(FALSE, tvb, offset, pinfo, tree, hf_cms_attributes);
}
static const ber_sequence_t ExtendedCertificateInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certificate },
@ -444,7 +451,7 @@ static const ber_sequence_t ExtendedCertificateInfo_sequence[] = {
static int
dissect_cms_ExtendedCertificateInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ExtendedCertificateInfo_sequence, hf_index, ett_cms_ExtendedCertificateInfo);
ExtendedCertificateInfo_sequence, hf_index, ett_cms_ExtendedCertificateInfo);
return offset;
}
@ -453,6 +460,7 @@ static int dissect_extendedCertificateInfo(packet_info *pinfo, proto_tree *tree,
}
static int
dissect_cms_SignatureAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -464,11 +472,12 @@ static int dissect_signatureAlgorithm(packet_info *pinfo, proto_tree *tree, tvbu
}
static int
dissect_cms_Signature(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -476,6 +485,7 @@ static int dissect_signature(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_cms_Signature(FALSE, tvb, offset, pinfo, tree, hf_cms_signature);
}
static const ber_sequence_t ExtendedCertificate_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_extendedCertificateInfo },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm },
@ -486,7 +496,7 @@ static const ber_sequence_t ExtendedCertificate_sequence[] = {
static int
dissect_cms_ExtendedCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ExtendedCertificate_sequence, hf_index, ett_cms_ExtendedCertificate);
ExtendedCertificate_sequence, hf_index, ett_cms_ExtendedCertificate);
return offset;
}
@ -512,7 +522,8 @@ static const ber_choice_t CertificateChoices_choice[] = {
static int
dissect_cms_CertificateChoices(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
CertificateChoices_choice, hf_index, ett_cms_CertificateChoices, NULL);
CertificateChoices_choice, hf_index, ett_cms_CertificateChoices,
NULL);
return offset;
}
@ -522,7 +533,7 @@ static int dissect_CertificateSet_item(packet_info *pinfo, proto_tree *tree, tvb
static const ber_sequence_t CertificateSet_set_of[1] = {
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CertificateSet_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_CertificateSet_item },
};
static int
@ -555,8 +566,9 @@ static int dissect_crls_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_cms_CertificateRevocationLists(TRUE, tvb, offset, pinfo, tree, hf_cms_crls);
}
static const ber_sequence_t IssuerAndSerialNumber_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ 0, 0, 0, NULL }
};
@ -564,7 +576,7 @@ static const ber_sequence_t IssuerAndSerialNumber_sequence[] = {
int
dissect_cms_IssuerAndSerialNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
IssuerAndSerialNumber_sequence, hf_index, ett_cms_IssuerAndSerialNumber);
IssuerAndSerialNumber_sequence, hf_index, ett_cms_IssuerAndSerialNumber);
return offset;
}
@ -604,7 +616,8 @@ static const ber_choice_t SignerIdentifier_choice[] = {
int
dissect_cms_SignerIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier, NULL);
SignerIdentifier_choice, hf_index, ett_cms_SignerIdentifier,
NULL);
return offset;
}
@ -657,9 +670,10 @@ static int dissect_unsignedAttrs_impl(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_cms_UnsignedAttributes(TRUE, tvb, offset, pinfo, tree, hf_cms_unsignedAttrs);
}
static const ber_sequence_t SignerInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sid },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_sid },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_signedAttrs_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm },
@ -671,7 +685,7 @@ static const ber_sequence_t SignerInfo_sequence[] = {
int
dissect_cms_SignerInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SignerInfo_sequence, hf_index, ett_cms_SignerInfo);
SignerInfo_sequence, hf_index, ett_cms_SignerInfo);
return offset;
}
@ -695,6 +709,7 @@ static int dissect_signerInfos(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_cms_SignerInfos(FALSE, tvb, offset, pinfo, tree, hf_cms_signerInfos);
}
static const ber_sequence_t SignedData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithms },
@ -708,11 +723,12 @@ static const ber_sequence_t SignedData_sequence[] = {
int
dissect_cms_SignedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SignedData_sequence, hf_index, ett_cms_SignedData);
SignedData_sequence, hf_index, ett_cms_SignedData);
return offset;
}
static const ber_sequence_t OriginatorInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_certs_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_crls_impl },
@ -722,7 +738,7 @@ static const ber_sequence_t OriginatorInfo_sequence[] = {
static int
dissect_cms_OriginatorInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
OriginatorInfo_sequence, hf_index, ett_cms_OriginatorInfo);
OriginatorInfo_sequence, hf_index, ett_cms_OriginatorInfo);
return offset;
}
@ -746,7 +762,8 @@ static const ber_choice_t RecipientIdentifier_choice[] = {
static int
dissect_cms_RecipientIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier, NULL);
RecipientIdentifier_choice, hf_index, ett_cms_RecipientIdentifier,
NULL);
return offset;
}
@ -755,6 +772,7 @@ static int dissect_rid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
}
static int
dissect_cms_KeyEncryptionAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -778,9 +796,10 @@ static int dissect_encryptedKey(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_cms_EncryptedKey(FALSE, tvb, offset, pinfo, tree, hf_cms_encryptedKey);
}
static const ber_sequence_t KeyTransRecipientInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rid },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rid },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_keyEncryptionAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedKey },
{ 0, 0, 0, NULL }
@ -789,7 +808,7 @@ static const ber_sequence_t KeyTransRecipientInfo_sequence[] = {
static int
dissect_cms_KeyTransRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
KeyTransRecipientInfo_sequence, hf_index, ett_cms_KeyTransRecipientInfo);
KeyTransRecipientInfo_sequence, hf_index, ett_cms_KeyTransRecipientInfo);
return offset;
}
@ -798,11 +817,12 @@ static int dissect_ktri(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
}
static int
dissect_cms_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -810,6 +830,7 @@ static int dissect_publicKey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_cms_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_cms_publicKey);
}
static const ber_sequence_t OriginatorPublicKey_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_publicKey },
@ -819,7 +840,7 @@ static const ber_sequence_t OriginatorPublicKey_sequence[] = {
static int
dissect_cms_OriginatorPublicKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
OriginatorPublicKey_sequence, hf_index, ett_cms_OriginatorPublicKey);
OriginatorPublicKey_sequence, hf_index, ett_cms_OriginatorPublicKey);
return offset;
}
@ -845,7 +866,8 @@ static const ber_choice_t OriginatorIdentifierOrKey_choice[] = {
static int
dissect_cms_OriginatorIdentifierOrKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey, NULL);
OriginatorIdentifierOrKey_choice, hf_index, ett_cms_OriginatorIdentifierOrKey,
NULL);
return offset;
}
@ -867,6 +889,7 @@ static int dissect_ukm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
}
static int
dissect_cms_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -904,6 +927,7 @@ static int dissect_keyAttr(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_cms_T_keyAttr(FALSE, tvb, offset, pinfo, tree, hf_cms_keyAttr);
}
static const ber_sequence_t OtherKeyAttribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_keyAttrId },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_keyAttr },
@ -913,7 +937,7 @@ static const ber_sequence_t OtherKeyAttribute_sequence[] = {
static int
dissect_cms_OtherKeyAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
OtherKeyAttribute_sequence, hf_index, ett_cms_OtherKeyAttribute);
OtherKeyAttribute_sequence, hf_index, ett_cms_OtherKeyAttribute);
return offset;
}
@ -921,6 +945,7 @@ static int dissect_other(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_cms_OtherKeyAttribute(FALSE, tvb, offset, pinfo, tree, hf_cms_other);
}
static const ber_sequence_t RecipientKeyIdentifier_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_subjectKeyIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date },
@ -931,7 +956,7 @@ static const ber_sequence_t RecipientKeyIdentifier_sequence[] = {
static int
dissect_cms_RecipientKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RecipientKeyIdentifier_sequence, hf_index, ett_cms_RecipientKeyIdentifier);
RecipientKeyIdentifier_sequence, hf_index, ett_cms_RecipientKeyIdentifier);
return offset;
}
@ -955,7 +980,8 @@ static const ber_choice_t KeyAgreeRecipientIdentifier_choice[] = {
static int
dissect_cms_KeyAgreeRecipientIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier, NULL);
KeyAgreeRecipientIdentifier_choice, hf_index, ett_cms_KeyAgreeRecipientIdentifier,
NULL);
return offset;
}
@ -963,8 +989,9 @@ static int dissect_rekRid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_cms_KeyAgreeRecipientIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_rekRid);
}
static const ber_sequence_t RecipientEncryptedKey_sequence[] = {
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rekRid },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_rekRid },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_encryptedKey },
{ 0, 0, 0, NULL }
};
@ -972,7 +999,7 @@ static const ber_sequence_t RecipientEncryptedKey_sequence[] = {
static int
dissect_cms_RecipientEncryptedKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RecipientEncryptedKey_sequence, hf_index, ett_cms_RecipientEncryptedKey);
RecipientEncryptedKey_sequence, hf_index, ett_cms_RecipientEncryptedKey);
return offset;
}
@ -996,6 +1023,7 @@ static int dissect_recipientEncryptedKeys(packet_info *pinfo, proto_tree *tree,
return dissect_cms_RecipientEncryptedKeys(FALSE, tvb, offset, pinfo, tree, hf_cms_recipientEncryptedKeys);
}
static const ber_sequence_t KeyAgreeRecipientInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_CON, 0, BER_FLAGS_NOTCHKTAG, dissect_originator },
@ -1008,7 +1036,7 @@ static const ber_sequence_t KeyAgreeRecipientInfo_sequence[] = {
static int
dissect_cms_KeyAgreeRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
KeyAgreeRecipientInfo_sequence, hf_index, ett_cms_KeyAgreeRecipientInfo);
KeyAgreeRecipientInfo_sequence, hf_index, ett_cms_KeyAgreeRecipientInfo);
return offset;
}
@ -1029,6 +1057,7 @@ static int dissect_keyIdentifier(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_cms_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_cms_keyIdentifier);
}
static const ber_sequence_t KEKIdentifier_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_keyIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_date },
@ -1039,7 +1068,7 @@ static const ber_sequence_t KEKIdentifier_sequence[] = {
static int
dissect_cms_KEKIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
KEKIdentifier_sequence, hf_index, ett_cms_KEKIdentifier);
KEKIdentifier_sequence, hf_index, ett_cms_KEKIdentifier);
return offset;
}
@ -1047,6 +1076,7 @@ static int dissect_kekid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_cms_KEKIdentifier(FALSE, tvb, offset, pinfo, tree, hf_cms_kekid);
}
static const ber_sequence_t KEKRecipientInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_kekid },
@ -1058,7 +1088,7 @@ static const ber_sequence_t KEKRecipientInfo_sequence[] = {
static int
dissect_cms_KEKRecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
KEKRecipientInfo_sequence, hf_index, ett_cms_KEKRecipientInfo);
KEKRecipientInfo_sequence, hf_index, ett_cms_KEKRecipientInfo);
return offset;
}
@ -1084,7 +1114,8 @@ static const ber_choice_t RecipientInfo_choice[] = {
static int
dissect_cms_RecipientInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
RecipientInfo_choice, hf_index, ett_cms_RecipientInfo, NULL);
RecipientInfo_choice, hf_index, ett_cms_RecipientInfo,
NULL);
return offset;
}
@ -1094,7 +1125,7 @@ static int dissect_RecipientInfos_item(packet_info *pinfo, proto_tree *tree, tvb
static const ber_sequence_t RecipientInfos_set_of[1] = {
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RecipientInfos_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_RecipientInfos_item },
};
static int
@ -1109,6 +1140,7 @@ static int dissect_recipientInfos(packet_info *pinfo, proto_tree *tree, tvbuff_t
}
static int
dissect_cms_ContentEncryptionAlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -1132,6 +1164,7 @@ static int dissect_encryptedContent_impl(packet_info *pinfo, proto_tree *tree, t
return dissect_cms_EncryptedContent(TRUE, tvb, offset, pinfo, tree, hf_cms_encryptedContent);
}
static const ber_sequence_t EncryptedContentInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType1 },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contentEncryptionAlgorithm },
@ -1142,7 +1175,7 @@ static const ber_sequence_t EncryptedContentInfo_sequence[] = {
static int
dissect_cms_EncryptedContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
EncryptedContentInfo_sequence, hf_index, ett_cms_EncryptedContentInfo);
EncryptedContentInfo_sequence, hf_index, ett_cms_EncryptedContentInfo);
return offset;
}
@ -1166,6 +1199,7 @@ static int dissect_unprotectedAttrs_impl(packet_info *pinfo, proto_tree *tree, t
return dissect_cms_UnprotectedAttributes(TRUE, tvb, offset, pinfo, tree, hf_cms_unprotectedAttrs);
}
static const ber_sequence_t EnvelopedData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originatorInfo_impl },
@ -1178,7 +1212,7 @@ static const ber_sequence_t EnvelopedData_sequence[] = {
int
dissect_cms_EnvelopedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
EnvelopedData_sequence, hf_index, ett_cms_EnvelopedData);
EnvelopedData_sequence, hf_index, ett_cms_EnvelopedData);
return offset;
}
@ -1196,6 +1230,7 @@ static int dissect_digest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_cms_Digest(FALSE, tvb, offset, pinfo, tree, hf_cms_digest);
}
static const ber_sequence_t DigestedData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_digestAlgorithm },
@ -1207,11 +1242,12 @@ static const ber_sequence_t DigestedData_sequence[] = {
static int
dissect_cms_DigestedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DigestedData_sequence, hf_index, ett_cms_DigestedData);
DigestedData_sequence, hf_index, ett_cms_DigestedData);
return offset;
}
static const ber_sequence_t EncryptedData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_encryptedContentInfo },
@ -1222,12 +1258,13 @@ static const ber_sequence_t EncryptedData_sequence[] = {
static int
dissect_cms_EncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
EncryptedData_sequence, hf_index, ett_cms_EncryptedData);
EncryptedData_sequence, hf_index, ett_cms_EncryptedData);
return offset;
}
static int
dissect_cms_MessageAuthenticationCodeAlgorithm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509af_AlgorithmIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -1267,6 +1304,7 @@ static int dissect_mac(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_cms_MessageAuthenticationCode(FALSE, tvb, offset, pinfo, tree, hf_cms_mac);
}
static const ber_sequence_t AuthenticatedData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_originatorInfo_impl },
@ -1283,12 +1321,13 @@ static const ber_sequence_t AuthenticatedData_sequence[] = {
static int
dissect_cms_AuthenticatedData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AuthenticatedData_sequence, hf_index, ett_cms_AuthenticatedData);
AuthenticatedData_sequence, hf_index, ett_cms_AuthenticatedData);
return offset;
}
int
dissect_cms_Countersignature(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_cms_SignerInfo(implicit_tag, tvb, offset, pinfo, tree, hf_index);

95
epan/dissectors/packet-crmf.c
View File

@ -233,11 +233,12 @@ static int dissect_version_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
}
static int
dissect_crmf_UniqueIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -249,11 +250,12 @@ static int dissect_subjectUID_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
}
static int
dissect_crmf_UTCTime(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, BER_UNI_TAG_UTCTime,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -262,6 +264,7 @@ static int dissect_utcTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
}
static int
dissect_crmf_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -288,7 +291,8 @@ static const ber_choice_t Time_choice[] = {
static int
dissect_crmf_Time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
Time_choice, hf_index, ett_crmf_Time, NULL);
Time_choice, hf_index, ett_crmf_Time,
NULL);
return offset;
}
@ -321,6 +325,7 @@ static int dissect_iterationCount(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_crmf_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_crmf_iterationCount);
}
static const ber_sequence_t OptionalValidity_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter_impl },
@ -330,7 +335,7 @@ static const ber_sequence_t OptionalValidity_sequence[] = {
int
dissect_crmf_OptionalValidity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
OptionalValidity_sequence, hf_index, ett_crmf_OptionalValidity);
OptionalValidity_sequence, hf_index, ett_crmf_OptionalValidity);
return offset;
}
@ -338,6 +343,7 @@ static int dissect_validity_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_crmf_OptionalValidity(TRUE, tvb, offset, pinfo, tree, hf_crmf_validity);
}
static const ber_sequence_t CertTemplate_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_version_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serialNumber_impl },
@ -355,7 +361,7 @@ static const ber_sequence_t CertTemplate_sequence[] = {
int
dissect_crmf_CertTemplate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertTemplate_sequence, hf_index, ett_crmf_CertTemplate);
CertTemplate_sequence, hf_index, ett_crmf_CertTemplate);
return offset;
}
@ -390,6 +396,7 @@ static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_crmf_T_value(FALSE, tvb, offset, pinfo, tree, hf_crmf_value);
}
static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
@ -399,7 +406,7 @@ static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
int
dissect_crmf_AttributeTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AttributeTypeAndValue_sequence, hf_index, ett_crmf_AttributeTypeAndValue);
AttributeTypeAndValue_sequence, hf_index, ett_crmf_AttributeTypeAndValue);
return offset;
}
@ -426,6 +433,7 @@ static int dissect_controls(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_crmf_Controls(FALSE, tvb, offset, pinfo, tree, hf_crmf_controls);
}
static const ber_sequence_t CertRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_certReqId },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certTemplate },
@ -436,7 +444,7 @@ static const ber_sequence_t CertRequest_sequence[] = {
int
dissect_crmf_CertRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertRequest_sequence, hf_index, ett_crmf_CertRequest);
CertRequest_sequence, hf_index, ett_crmf_CertRequest);
return offset;
}
@ -457,11 +465,12 @@ static int dissect_raVerified_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
}
static int
dissect_crmf_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -484,6 +493,7 @@ static int dissect_encValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_crmf_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_crmf_encValue);
}
static const ber_sequence_t PKMACValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algId },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_pkmac_value },
@ -493,7 +503,7 @@ static const ber_sequence_t PKMACValue_sequence[] = {
int
dissect_crmf_PKMACValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PKMACValue_sequence, hf_index, ett_crmf_PKMACValue);
PKMACValue_sequence, hf_index, ett_crmf_PKMACValue);
return offset;
}
@ -517,7 +527,8 @@ static const ber_choice_t T_authInfo_choice[] = {
static int
dissect_crmf_T_authInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
T_authInfo_choice, hf_index, ett_crmf_T_authInfo, NULL);
T_authInfo_choice, hf_index, ett_crmf_T_authInfo,
NULL);
return offset;
}
@ -525,8 +536,9 @@ static int dissect_authInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_crmf_T_authInfo(FALSE, tvb, offset, pinfo, tree, hf_crmf_authInfo);
}
static const ber_sequence_t POPOSigningKeyInput_sequence[] = {
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authInfo },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_authInfo },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_publicKey },
{ 0, 0, 0, NULL }
};
@ -534,7 +546,7 @@ static const ber_sequence_t POPOSigningKeyInput_sequence[] = {
int
dissect_crmf_POPOSigningKeyInput(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
POPOSigningKeyInput_sequence, hf_index, ett_crmf_POPOSigningKeyInput);
POPOSigningKeyInput_sequence, hf_index, ett_crmf_POPOSigningKeyInput);
return offset;
}
@ -542,6 +554,7 @@ static int dissect_poposkInput_impl(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_crmf_POPOSigningKeyInput(TRUE, tvb, offset, pinfo, tree, hf_crmf_poposkInput);
}
static const ber_sequence_t POPOSigningKey_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_poposkInput_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_algorithmIdentifier },
@ -552,7 +565,7 @@ static const ber_sequence_t POPOSigningKey_sequence[] = {
int
dissect_crmf_POPOSigningKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
POPOSigningKey_sequence, hf_index, ett_crmf_POPOSigningKey);
POPOSigningKey_sequence, hf_index, ett_crmf_POPOSigningKey);
return offset;
}
@ -597,7 +610,8 @@ static const ber_choice_t POPOPrivKey_choice[] = {
int
dissect_crmf_POPOPrivKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey, NULL);
POPOPrivKey_choice, hf_index, ett_crmf_POPOPrivKey,
NULL);
return offset;
}
@ -628,7 +642,8 @@ static const ber_choice_t ProofOfPossession_choice[] = {
int
dissect_crmf_ProofOfPossession(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession, NULL);
ProofOfPossession_choice, hf_index, ett_crmf_ProofOfPossession,
NULL);
return offset;
}
@ -652,9 +667,10 @@ static int dissect_regInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_crmf_regInfo);
}
static const ber_sequence_t CertReqMsg_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certReq },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pop },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_pop },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_regInfo },
{ 0, 0, 0, NULL }
};
@ -662,7 +678,7 @@ static const ber_sequence_t CertReqMsg_sequence[] = {
int
dissect_crmf_CertReqMsg(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertReqMsg_sequence, hf_index, ett_crmf_CertReqMsg);
CertReqMsg_sequence, hf_index, ett_crmf_CertReqMsg);
return offset;
}
@ -699,6 +715,7 @@ static int dissect_valueHint_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_crmf_OCTET_STRING(TRUE, tvb, offset, pinfo, tree, hf_crmf_valueHint);
}
static const ber_sequence_t PBMParameter_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_salt },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_owf },
@ -710,27 +727,29 @@ static const ber_sequence_t PBMParameter_sequence[] = {
int
dissect_crmf_PBMParameter(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PBMParameter_sequence, hf_index, ett_crmf_PBMParameter);
PBMParameter_sequence, hf_index, ett_crmf_PBMParameter);
return offset;
}
int
dissect_crmf_RegToken(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, BER_UNI_TAG_UTF8String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
int
dissect_crmf_Authenticator(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, BER_UNI_TAG_UTF8String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -775,6 +794,7 @@ static int dissect_pubMethod(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_crmf_T_pubMethod(FALSE, tvb, offset, pinfo, tree, hf_crmf_pubMethod);
}
static const ber_sequence_t SinglePubInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pubMethod },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pubLocation },
@ -784,7 +804,7 @@ static const ber_sequence_t SinglePubInfo_sequence[] = {
int
dissect_crmf_SinglePubInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SinglePubInfo_sequence, hf_index, ett_crmf_SinglePubInfo);
SinglePubInfo_sequence, hf_index, ett_crmf_SinglePubInfo);
return offset;
}
@ -808,6 +828,7 @@ static int dissect_pubInfos(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo(FALSE, tvb, offset, pinfo, tree, hf_crmf_pubInfos);
}
static const ber_sequence_t PKIPublicationInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_action },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_pubInfos },
@ -817,11 +838,12 @@ static const ber_sequence_t PKIPublicationInfo_sequence[] = {
int
dissect_crmf_PKIPublicationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PKIPublicationInfo_sequence, hf_index, ett_crmf_PKIPublicationInfo);
PKIPublicationInfo_sequence, hf_index, ett_crmf_PKIPublicationInfo);
return offset;
}
static const ber_sequence_t EncryptedValue_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_intendedAlg_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_symmAlg_impl },
@ -835,7 +857,7 @@ static const ber_sequence_t EncryptedValue_sequence[] = {
int
dissect_crmf_EncryptedValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
EncryptedValue_sequence, hf_index, ett_crmf_EncryptedValue);
EncryptedValue_sequence, hf_index, ett_crmf_EncryptedValue);
return offset;
}
@ -859,7 +881,8 @@ static const ber_choice_t EncryptedKey_choice[] = {
int
dissect_crmf_EncryptedKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey, NULL);
EncryptedKey_choice, hf_index, ett_crmf_EncryptedKey,
NULL);
return offset;
}
@ -910,11 +933,13 @@ static const ber_choice_t PKIArchiveOptions_choice[] = {
int
dissect_crmf_PKIArchiveOptions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions, NULL);
PKIArchiveOptions_choice, hf_index, ett_crmf_PKIArchiveOptions,
NULL);
return offset;
}
static const ber_sequence_t CertId_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
@ -924,12 +949,13 @@ static const ber_sequence_t CertId_sequence[] = {
int
dissect_crmf_CertId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertId_sequence, hf_index, ett_crmf_CertId);
CertId_sequence, hf_index, ett_crmf_CertId);
return offset;
}
int
dissect_crmf_OldCertId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_crmf_CertId(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -938,6 +964,7 @@ dissect_crmf_OldCertId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pac
}
int
dissect_crmf_ProtocolEncrKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_pkix1explicit_SubjectPublicKeyInfo(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -946,16 +973,18 @@ dissect_crmf_ProtocolEncrKey(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
}
int
dissect_crmf_UTF8Pairs(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, BER_UNI_TAG_UTF8String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
int
dissect_crmf_CertReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_crmf_CertRequest(implicit_tag, tvb, offset, pinfo, tree, hf_index);

56
epan/dissectors/packet-ess.c
View File

@ -240,7 +240,8 @@ static const ber_choice_t ReceiptsFrom_choice[] = {
static int
dissect_ess_ReceiptsFrom(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom, NULL);
ReceiptsFrom_choice, hf_index, ett_ess_ReceiptsFrom,
NULL);
return offset;
}
@ -248,9 +249,10 @@ static int dissect_receiptsFrom(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_ess_ReceiptsFrom(FALSE, tvb, offset, pinfo, tree, hf_ess_receiptsFrom);
}
static const ber_sequence_t ReceiptRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_receiptsFrom },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_receiptsFrom },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_receiptsTo },
{ 0, 0, 0, NULL }
};
@ -258,7 +260,7 @@ static const ber_sequence_t ReceiptRequest_sequence[] = {
static int
dissect_ess_ReceiptRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ReceiptRequest_sequence, hf_index, ett_ess_ReceiptRequest);
ReceiptRequest_sequence, hf_index, ett_ess_ReceiptRequest);
return offset;
}
@ -294,6 +296,7 @@ static int dissect_originatorSignatureValue(packet_info *pinfo, proto_tree *tree
return dissect_ess_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_ess_originatorSignatureValue);
}
static const ber_sequence_t Receipt_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
@ -305,17 +308,18 @@ static const ber_sequence_t Receipt_sequence[] = {
static int
dissect_ess_Receipt(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Receipt_sequence, hf_index, ett_ess_Receipt);
Receipt_sequence, hf_index, ett_ess_Receipt);
return offset;
}
static int
dissect_ess_UTF8String(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, BER_UNI_TAG_UTF8String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -326,6 +330,7 @@ static int dissect_utf8String(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_ess_UTF8String(FALSE, tvb, offset, pinfo, tree, hf_ess_utf8String);
}
static const ber_sequence_t ContentHints_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_UTF8String, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contentDescription },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
@ -335,7 +340,7 @@ static const ber_sequence_t ContentHints_sequence[] = {
static int
dissect_ess_ContentHints(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ContentHints_sequence, hf_index, ett_ess_ContentHints);
ContentHints_sequence, hf_index, ett_ess_ContentHints);
return offset;
}
@ -350,6 +355,7 @@ dissect_ess_MsgSigDigest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
return offset;
}
static const ber_sequence_t ContentReference_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contentType },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_signedContentIdentifier },
@ -360,7 +366,7 @@ static const ber_sequence_t ContentReference_sequence[] = {
static int
dissect_ess_ContentReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ContentReference_sequence, hf_index, ett_ess_ContentReference);
ContentReference_sequence, hf_index, ett_ess_ContentReference);
return offset;
}
@ -396,11 +402,12 @@ dissect_ess_SecurityClassification(gboolean implicit_tag _U_, tvbuff_t *tvb, int
}
static int
dissect_ess_PrintableString(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, BER_UNI_TAG_PrintableString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -424,7 +431,8 @@ static const ber_choice_t ESSPrivacyMark_choice[] = {
static int
dissect_ess_ESSPrivacyMark(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark, NULL);
ESSPrivacyMark_choice, hf_index, ett_ess_ESSPrivacyMark,
NULL);
return offset;
}
@ -456,6 +464,7 @@ static int dissect_value_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_ess_T_value(TRUE, tvb, offset, pinfo, tree, hf_ess_value);
}
static const ber_sequence_t SecurityCategory_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_type_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_value_impl },
@ -465,7 +474,7 @@ static const ber_sequence_t SecurityCategory_sequence[] = {
static int
dissect_ess_SecurityCategory(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SecurityCategory_sequence, hf_index, ett_ess_SecurityCategory);
SecurityCategory_sequence, hf_index, ett_ess_SecurityCategory);
return offset;
}
@ -502,7 +511,8 @@ static const ber_choice_t EntityIdentifier_choice[] = {
static int
dissect_ess_EntityIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier, NULL);
EntityIdentifier_choice, hf_index, ett_ess_EntityIdentifier,
NULL);
return offset;
}
@ -511,6 +521,7 @@ static int dissect_mailListIdentifier(packet_info *pinfo, proto_tree *tree, tvbu
}
static int
dissect_ess_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -551,7 +562,8 @@ static const ber_choice_t MLReceiptPolicy_choice[] = {
static int
dissect_ess_MLReceiptPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy, NULL);
MLReceiptPolicy_choice, hf_index, ett_ess_MLReceiptPolicy,
NULL);
return offset;
}
@ -559,17 +571,18 @@ static int dissect_mlReceiptPolicy(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_ess_MLReceiptPolicy(FALSE, tvb, offset, pinfo, tree, hf_ess_mlReceiptPolicy);
}
static const ber_sequence_t MLData_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mailListIdentifier },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mailListIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_expansionTime },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mlReceiptPolicy },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_mlReceiptPolicy },
{ 0, 0, 0, NULL }
};
static int
dissect_ess_MLData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MLData_sequence, hf_index, ett_ess_MLData);
MLData_sequence, hf_index, ett_ess_MLData);
return offset;
}
@ -603,6 +616,7 @@ static int dissect_certHash(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_ess_Hash(FALSE, tvb, offset, pinfo, tree, hf_ess_certHash);
}
static const ber_sequence_t IssuerSerial_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
@ -612,7 +626,7 @@ static const ber_sequence_t IssuerSerial_sequence[] = {
static int
dissect_ess_IssuerSerial(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
IssuerSerial_sequence, hf_index, ett_ess_IssuerSerial);
IssuerSerial_sequence, hf_index, ett_ess_IssuerSerial);
return offset;
}
@ -620,6 +634,7 @@ static int dissect_issuerSerial(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_ess_IssuerSerial(FALSE, tvb, offset, pinfo, tree, hf_ess_issuerSerial);
}
static const ber_sequence_t ESSCertID_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_certHash },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuerSerial },
@ -629,7 +644,7 @@ static const ber_sequence_t ESSCertID_sequence[] = {
static int
dissect_ess_ESSCertID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ESSCertID_sequence, hf_index, ett_ess_ESSCertID);
ESSCertID_sequence, hf_index, ett_ess_ESSCertID);
return offset;
}
@ -669,6 +684,7 @@ static int dissect_policies(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_ess_SEQUENCE_OF_PolicyInformation(FALSE, tvb, offset, pinfo, tree, hf_ess_policies);
}
static const ber_sequence_t SigningCertificate_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_policies },
@ -678,7 +694,7 @@ static const ber_sequence_t SigningCertificate_sequence[] = {
static int
dissect_ess_SigningCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SigningCertificate_sequence, hf_index, ett_ess_SigningCertificate);
SigningCertificate_sequence, hf_index, ett_ess_SigningCertificate);
return offset;
}

438
epan/dissectors/packet-ftam.c
View File

File diff suppressed because it is too large Load Diff

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

@ -1292,11 +1292,12 @@ static int dissect_ip6Address_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
}
static int
dissect_h248_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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -1326,11 +1327,12 @@ static int dissect_domainName_impl(packet_info *pinfo, proto_tree *tree, tvbuff_
}
static int
dissect_h248_PathName(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -1390,11 +1392,12 @@ static int dissect_errorCode_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
}
static int
dissect_h248_ErrorText(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -2240,11 +2243,12 @@ static int dissect_h221NonStandard_impl(packet_info *pinfo, proto_tree *tree, tv
}
static int
dissect_h248_IA5String_SIZE_8(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -2519,6 +2523,7 @@ static int dissect_sigType_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_h248_SignalType(TRUE, tvb, offset, pinfo, tree, hf_h248_sigType);
}
static const asn_namedbit NotifyCompletion_bits[] = {
{ 0, &hf_h248_NotifyCompletion_onTimeOut, -1, -1, "onTimeOut", NULL },
{ 1, &hf_h248_NotifyCompletion_onInterruptByEvent, -1, -1, "onInterruptByEvent", NULL },
@ -2530,8 +2535,8 @@ static const asn_namedbit NotifyCompletion_bits[] = {
static int
dissect_h248_NotifyCompletion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NotifyCompletion_bits, hf_index, ett_h248_NotifyCompletion,
NULL);
NotifyCompletion_bits, hf_index, ett_h248_NotifyCompletion,
NULL);
return offset;
}
@ -2683,7 +2688,7 @@ static int dissect_SignalsDescriptor_item(packet_info *pinfo, proto_tree *tree,
static const ber_sequence_t SignalsDescriptor_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SignalsDescriptor_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SignalsDescriptor_item },
};
static int
@ -2935,6 +2940,7 @@ static int dissect_digitMapDescriptor_impl(packet_info *pinfo, proto_tree *tree,
return dissect_h248_DigitMapDescriptor(TRUE, tvb, offset, pinfo, tree, hf_h248_digitMapDescriptor);
}
static const asn_namedbit T_auditToken_bits[] = {
{ 0, &hf_h248_T_auditToken_muxToken, -1, -1, "muxToken", NULL },
{ 1, &hf_h248_T_auditToken_modemToken, -1, -1, "modemToken", NULL },
@ -2952,8 +2958,8 @@ static const asn_namedbit T_auditToken_bits[] = {
static int
dissect_h248_T_auditToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
T_auditToken_bits, hf_index, ett_h248_T_auditToken,
NULL);
T_auditToken_bits, hf_index, ett_h248_T_auditToken,
NULL);
return offset;
}
@ -3362,7 +3368,7 @@ static int dissect_auditPropertyToken_item(packet_info *pinfo, proto_tree *tree,
static const ber_sequence_t SEQUENCE_OF_IndAuditParameter_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_auditPropertyToken_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_auditPropertyToken_item },
};
static int
@ -3439,7 +3445,7 @@ static int dissect_descriptors_item(packet_info *pinfo, proto_tree *tree, tvbuff
static const ber_sequence_t SEQUENCE_OF_AmmDescriptor_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_descriptors_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_descriptors_item },
};
static int
@ -3740,11 +3746,12 @@ static int dissect_serviceChangeAddress(packet_info *pinfo, proto_tree *tree, tv
}
static int
dissect_h248_IA5String_SIZE_1_67(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -4086,7 +4093,7 @@ static int dissect_TerminationAudit_item(packet_info *pinfo, proto_tree *tree, t
static const ber_sequence_t TerminationAudit_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_TerminationAudit_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_TerminationAudit_item },
};
static int
@ -4370,7 +4377,7 @@ static int dissect_commandReply_item(packet_info *pinfo, proto_tree *tree, tvbuf
static const ber_sequence_t SEQUENCE_OF_CommandReply_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_commandReply_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_commandReply_item },
};
static int
@ -4530,7 +4537,7 @@ static int dissect_transactions_item(packet_info *pinfo, proto_tree *tree, tvbuf
static const ber_sequence_t SEQUENCE_OF_Transaction_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_transactions_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_transactions_item },
};
static int

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

@ -136,11 +136,12 @@ static int dissect_hashAlg(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
}
static int
dissect_logotypecertextn_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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -170,6 +171,7 @@ static int dissect_hashValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_logotypecertextn_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_hashValue);
}
static const ber_sequence_t HashAlgAndValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlg },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashValue },
@ -179,7 +181,7 @@ static const ber_sequence_t HashAlgAndValue_sequence[] = {
static int
dissect_logotypecertextn_HashAlgAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
HashAlgAndValue_sequence, hf_index, ett_logotypecertextn_HashAlgAndValue);
HashAlgAndValue_sequence, hf_index, ett_logotypecertextn_HashAlgAndValue);
return offset;
}
@ -225,6 +227,7 @@ static int dissect_logotypeURI(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_logotypecertextn_T_logotypeURI(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeURI);
}
static const ber_sequence_t LogotypeDetails_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_NOOWNTAG, dissect_mediaType },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_logotypeHash },
@ -235,7 +238,7 @@ static const ber_sequence_t LogotypeDetails_sequence[] = {
static int
dissect_logotypecertextn_LogotypeDetails(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
LogotypeDetails_sequence, hf_index, ett_logotypecertextn_LogotypeDetails);
LogotypeDetails_sequence, hf_index, ett_logotypecertextn_LogotypeDetails);
return offset;
}
@ -315,7 +318,8 @@ static const ber_choice_t LogotypeImageResolution_choice[] = {
static int
dissect_logotypecertextn_LogotypeImageResolution(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution, NULL);
LogotypeImageResolution_choice, hf_index, ett_logotypecertextn_LogotypeImageResolution,
NULL);
return offset;
}
@ -323,12 +327,13 @@ static int dissect_resolution(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_logotypecertextn_LogotypeImageResolution(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_resolution);
}
static const ber_sequence_t LogotypeImageInfo_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_type_impl },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_fileSize },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_xSize },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ySize },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_resolution },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_resolution },
{ BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_language_impl },
{ 0, 0, 0, NULL }
};
@ -336,7 +341,7 @@ static const ber_sequence_t LogotypeImageInfo_sequence[] = {
static int
dissect_logotypecertextn_LogotypeImageInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
LogotypeImageInfo_sequence, hf_index, ett_logotypecertextn_LogotypeImageInfo);
LogotypeImageInfo_sequence, hf_index, ett_logotypecertextn_LogotypeImageInfo);
return offset;
}
@ -344,6 +349,7 @@ static int dissect_imageInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_logotypecertextn_LogotypeImageInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_imageInfo);
}
static const ber_sequence_t LogotypeImage_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_imageDetails },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_imageInfo },
@ -353,7 +359,7 @@ static const ber_sequence_t LogotypeImage_sequence[] = {
static int
dissect_logotypecertextn_LogotypeImage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
LogotypeImage_sequence, hf_index, ett_logotypecertextn_LogotypeImage);
LogotypeImage_sequence, hf_index, ett_logotypecertextn_LogotypeImage);
return offset;
}
@ -377,6 +383,7 @@ static int dissect_image(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_logotypecertextn_SEQUENCE_OF_LogotypeImage(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_image);
}
static const ber_sequence_t LogotypeAudioInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_fileSize },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_playTime },
@ -389,7 +396,7 @@ static const ber_sequence_t LogotypeAudioInfo_sequence[] = {
static int
dissect_logotypecertextn_LogotypeAudioInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
LogotypeAudioInfo_sequence, hf_index, ett_logotypecertextn_LogotypeAudioInfo);
LogotypeAudioInfo_sequence, hf_index, ett_logotypecertextn_LogotypeAudioInfo);
return offset;
}
@ -397,6 +404,7 @@ static int dissect_audioInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_logotypecertextn_LogotypeAudioInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_audioInfo);
}
static const ber_sequence_t LogotypeAudio_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_audioDetails },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_audioInfo },
@ -406,7 +414,7 @@ static const ber_sequence_t LogotypeAudio_sequence[] = {
static int
dissect_logotypecertextn_LogotypeAudio(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
LogotypeAudio_sequence, hf_index, ett_logotypecertextn_LogotypeAudio);
LogotypeAudio_sequence, hf_index, ett_logotypecertextn_LogotypeAudio);
return offset;
}
@ -430,6 +438,7 @@ static int dissect_audio_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_logotypecertextn_SEQUENCE_OF_LogotypeAudio(TRUE, tvb, offset, pinfo, tree, hf_logotypecertextn_audio);
}
static const ber_sequence_t LogotypeData_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_image },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_audio_impl },
@ -439,7 +448,7 @@ static const ber_sequence_t LogotypeData_sequence[] = {
static int
dissect_logotypecertextn_LogotypeData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
LogotypeData_sequence, hf_index, ett_logotypecertextn_LogotypeData);
LogotypeData_sequence, hf_index, ett_logotypecertextn_LogotypeData);
return offset;
}
@ -463,6 +472,7 @@ static int dissect_refStructURI(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_logotypecertextn_T_refStructURI(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_refStructURI);
}
static const ber_sequence_t LogotypeReference_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructHash },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_refStructURI },
@ -472,7 +482,7 @@ static const ber_sequence_t LogotypeReference_sequence[] = {
static int
dissect_logotypecertextn_LogotypeReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
LogotypeReference_sequence, hf_index, ett_logotypecertextn_LogotypeReference);
LogotypeReference_sequence, hf_index, ett_logotypecertextn_LogotypeReference);
return offset;
}
@ -496,7 +506,8 @@ static const ber_choice_t LogotypeInfo_choice[] = {
static int
dissect_logotypecertextn_LogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo, NULL);
LogotypeInfo_choice, hf_index, ett_logotypecertextn_LogotypeInfo,
NULL);
return offset;
}
@ -515,7 +526,7 @@ static int dissect_info(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
static const ber_sequence_t SEQUENCE_OF_LogotypeInfo_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_communityLogos_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_communityLogos_item },
};
static int
@ -542,16 +553,17 @@ static int dissect_logotypeType(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_logotypecertextn_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_logotypeType);
}
static const ber_sequence_t OtherLogotypeInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_logotypeType },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info },
{ 0, 0, 0, NULL }
};
static int
dissect_logotypecertextn_OtherLogotypeInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
OtherLogotypeInfo_sequence, hf_index, ett_logotypecertextn_OtherLogotypeInfo);
OtherLogotypeInfo_sequence, hf_index, ett_logotypecertextn_OtherLogotypeInfo);
return offset;
}
@ -575,6 +587,7 @@ static int dissect_otherLogos(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_logotypecertextn_SEQUENCE_OF_OtherLogotypeInfo(FALSE, tvb, offset, pinfo, tree, hf_logotypecertextn_otherLogos);
}
static const ber_sequence_t LogotypeExtn_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_communityLogos },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_NOTCHKTAG, dissect_issuerLogo },
@ -586,7 +599,7 @@ static const ber_sequence_t LogotypeExtn_sequence[] = {
static int
dissect_logotypecertextn_LogotypeExtn(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
LogotypeExtn_sequence, hf_index, ett_logotypecertextn_LogotypeExtn);
LogotypeExtn_sequence, hf_index, ett_logotypecertextn_LogotypeExtn);
return offset;
}

677
epan/dissectors/packet-mms.c
View File

File diff suppressed because it is too large Load Diff

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

@ -1,12 +1,13 @@
/* Do not modify this file. */
/* It is created automatically by the ASN.1 to Ethereal dissector compiler */
/* ./packet-ns_cert_exts.c */
/* ../../tools/asn2eth.py -X -b -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */
/* ../../tools/asn2eth.py -X -b -e -p ns_cert_exts -c ns_cert_exts.cnf -s packet-ns_cert_exts-template NETSCAPE-CERT-EXTS.asn */
/* Input file: packet-ns_cert_exts-template.c */
/* packet-ns_cert_exts.c
* Routines for NetScape Certificate Extensions packet dissection
* Ronnie Sahlberg 2004
*
* $Id$
*
@ -83,87 +84,95 @@ static gint ett_ns_cert_exts_CertType = -1;
static int
dissect_ns_cert_exts_BaseUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
dissect_ns_cert_exts_BaseUrl(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static int
dissect_ns_cert_exts_RevocationUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
dissect_ns_cert_exts_RevocationUrl(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static int
dissect_ns_cert_exts_CaRevocationUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
dissect_ns_cert_exts_CaRevocationUrl(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static int
dissect_ns_cert_exts_CaPolicyUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
dissect_ns_cert_exts_CaPolicyUrl(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static int
dissect_ns_cert_exts_Comment(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
dissect_ns_cert_exts_Comment(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static int
dissect_ns_cert_exts_SslServerName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
dissect_ns_cert_exts_SslServerName(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static int
dissect_ns_cert_exts_CertRenewalUrl(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
dissect_ns_cert_exts_CertRenewalUrl(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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
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 },
{ 0, &hf_ns_cert_exts_CertType_client, -1, -1, "client", NULL },
{ 1, &hf_ns_cert_exts_CertType_server, -1, -1, "server", NULL },
{ 5, &hf_ns_cert_exts_CertType_ca, -1, -1, "ca", NULL },
{ 0, NULL, 0, 0, NULL, NULL }
};
static int
dissect_ns_cert_exts_CertType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
dissect_ns_cert_exts_CertType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
CertType_bits, hf_index, ett_ns_cert_exts_CertType,
NULL);
CertType_bits, hf_index, ett_ns_cert_exts_CertType,
NULL);
return offset;
}
@ -283,14 +292,14 @@ void proto_reg_handoff_ns_cert_exts(void) {
/*--- Included file: packet-ns_cert_exts-dis-tab.c ---*/
register_ber_oid_dissector("2.16.840.1.113730.1.1", dissect_CertType_PDU, proto_ns_cert_exts, "ns-cert-exts.cert_type");
register_ber_oid_dissector("2.16.840.1.113730.1.2", dissect_BaseUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.base_url");
register_ber_oid_dissector("2.16.840.1.113730.1.3", dissect_RevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.revocation-url");
register_ber_oid_dissector("2.16.840.1.113730.1.4", dissect_CaRevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-revocation-url");
register_ber_oid_dissector("2.16.840.1.113730.1.7", dissect_CertRenewalUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.cert-renewal-url");
register_ber_oid_dissector("2.16.840.1.113730.1.8", dissect_CaPolicyUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-policy-url");
register_ber_oid_dissector("2.16.840.1.113730.1.12", dissect_SslServerName_PDU, proto_ns_cert_exts, "ns-cert-exts.ssl-server-name");
register_ber_oid_dissector("2.16.840.1.113730.1.13", dissect_Comment_PDU, proto_ns_cert_exts, "ns-cert-exts.comment");
register_ber_oid_dissector("2.16.840.1.113730.1.1", dissect_CertType_PDU, proto_ns_cert_exts, "ns-cert-exts.cert_type");
register_ber_oid_dissector("2.16.840.1.113730.1.2", dissect_BaseUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.base_url");
register_ber_oid_dissector("2.16.840.1.113730.1.3", dissect_RevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.revocation-url");
register_ber_oid_dissector("2.16.840.1.113730.1.4", dissect_CaRevocationUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-revocation-url");
register_ber_oid_dissector("2.16.840.1.113730.1.7", dissect_CertRenewalUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.cert-renewal-url");
register_ber_oid_dissector("2.16.840.1.113730.1.8", dissect_CaPolicyUrl_PDU, proto_ns_cert_exts, "ns-cert-exts.ca-policy-url");
register_ber_oid_dissector("2.16.840.1.113730.1.12", dissect_SslServerName_PDU, proto_ns_cert_exts, "ns-cert-exts.ssl-server-name");
register_ber_oid_dissector("2.16.840.1.113730.1.13", dissect_Comment_PDU, proto_ns_cert_exts, "ns-cert-exts.comment");
/*--- End of included file: packet-ns_cert_exts-dis-tab.c ---*/

61
epan/dissectors/packet-ocsp.c
View File

@ -221,6 +221,7 @@ static int dissect_issuerKeyHash(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_ocsp_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_ocsp_issuerKeyHash);
}
static const ber_sequence_t CertID_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_issuerNameHash },
@ -232,7 +233,7 @@ static const ber_sequence_t CertID_sequence[] = {
static int
dissect_ocsp_CertID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertID_sequence, hf_index, ett_ocsp_CertID);
CertID_sequence, hf_index, ett_ocsp_CertID);
return offset;
}
@ -243,6 +244,7 @@ static int dissect_certID(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_ocsp_CertID(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certID);
}
static const ber_sequence_t Request_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_reqCert },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_singleRequestExtensions },
@ -252,7 +254,7 @@ static const ber_sequence_t Request_sequence[] = {
static int
dissect_ocsp_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Request_sequence, hf_index, ett_ocsp_Request);
Request_sequence, hf_index, ett_ocsp_Request);
return offset;
}
@ -276,6 +278,7 @@ static int dissect_requestList(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_ocsp_SEQUENCE_OF_Request(FALSE, tvb, offset, pinfo, tree, hf_ocsp_requestList);
}
static const ber_sequence_t TBSRequest_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_requestorName },
@ -287,7 +290,7 @@ static const ber_sequence_t TBSRequest_sequence[] = {
static int
dissect_ocsp_TBSRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
TBSRequest_sequence, hf_index, ett_ocsp_TBSRequest);
TBSRequest_sequence, hf_index, ett_ocsp_TBSRequest);
return offset;
}
@ -296,11 +299,12 @@ static int dissect_tbsRequest(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
}
static int
dissect_ocsp_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -324,6 +328,7 @@ static int dissect_certs(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_ocsp_SEQUENCE_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certs);
}
static const ber_sequence_t Signature_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_signature },
@ -334,7 +339,7 @@ static const ber_sequence_t Signature_sequence[] = {
static int
dissect_ocsp_Signature(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Signature_sequence, hf_index, ett_ocsp_Signature);
Signature_sequence, hf_index, ett_ocsp_Signature);
return offset;
}
@ -342,6 +347,7 @@ static int dissect_optionalSignature(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_ocsp_Signature(FALSE, tvb, offset, pinfo, tree, hf_ocsp_optionalSignature);
}
static const ber_sequence_t OCSPRequest_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tbsRequest },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_optionalSignature },
@ -351,7 +357,7 @@ static const ber_sequence_t OCSPRequest_sequence[] = {
static int
dissect_ocsp_OCSPRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
OCSPRequest_sequence, hf_index, ett_ocsp_OCSPRequest);
OCSPRequest_sequence, hf_index, ett_ocsp_OCSPRequest);
return offset;
}
@ -413,6 +419,7 @@ static int dissect_response(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_ocsp_T_response(FALSE, tvb, offset, pinfo, tree, hf_ocsp_response);
}
static const ber_sequence_t ResponseBytes_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_responseType },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_response },
@ -422,7 +429,7 @@ static const ber_sequence_t ResponseBytes_sequence[] = {
static int
dissect_ocsp_ResponseBytes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ResponseBytes_sequence, hf_index, ett_ocsp_ResponseBytes);
ResponseBytes_sequence, hf_index, ett_ocsp_ResponseBytes);
return offset;
}
@ -430,6 +437,7 @@ static int dissect_responseBytes(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_ocsp_ResponseBytes(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responseBytes);
}
static const ber_sequence_t OCSPResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_responseStatus },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_responseBytes },
@ -439,7 +447,7 @@ static const ber_sequence_t OCSPResponse_sequence[] = {
static int
dissect_ocsp_OCSPResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
OCSPResponse_sequence, hf_index, ett_ocsp_OCSPResponse);
OCSPResponse_sequence, hf_index, ett_ocsp_OCSPResponse);
return offset;
}
@ -473,7 +481,8 @@ static const ber_choice_t ResponderID_choice[] = {
static int
dissect_ocsp_ResponderID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
ResponderID_choice, hf_index, ett_ocsp_ResponderID, NULL);
ResponderID_choice, hf_index, ett_ocsp_ResponderID,
NULL);
return offset;
}
@ -482,6 +491,7 @@ static int dissect_responderID(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
}
static int
dissect_ocsp_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -516,6 +526,7 @@ static int dissect_good_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_ocsp_NULL(TRUE, tvb, offset, pinfo, tree, hf_ocsp_good);
}
static const ber_sequence_t RevokedInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_revocationTime },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_revocationReason },
@ -525,7 +536,7 @@ static const ber_sequence_t RevokedInfo_sequence[] = {
static int
dissect_ocsp_RevokedInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RevokedInfo_sequence, hf_index, ett_ocsp_RevokedInfo);
RevokedInfo_sequence, hf_index, ett_ocsp_RevokedInfo);
return offset;
}
@ -563,7 +574,8 @@ static const ber_choice_t CertStatus_choice[] = {
static int
dissect_ocsp_CertStatus(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
CertStatus_choice, hf_index, ett_ocsp_CertStatus, NULL);
CertStatus_choice, hf_index, ett_ocsp_CertStatus,
NULL);
return offset;
}
@ -571,9 +583,10 @@ static int dissect_certStatus(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_ocsp_CertStatus(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certStatus);
}
static const ber_sequence_t SingleResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certID },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certStatus },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_certStatus },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_thisUpdate },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_nextUpdate },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_singleExtensions },
@ -583,7 +596,7 @@ static const ber_sequence_t SingleResponse_sequence[] = {
static int
dissect_ocsp_SingleResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SingleResponse_sequence, hf_index, ett_ocsp_SingleResponse);
SingleResponse_sequence, hf_index, ett_ocsp_SingleResponse);
return offset;
}
@ -607,9 +620,10 @@ static int dissect_responses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_ocsp_SEQUENCE_OF_SingleResponse(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responses);
}
static const ber_sequence_t ResponseData_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_responderID },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_responderID },
{ BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_producedAt },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_responses },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_responseExtensions },
@ -619,7 +633,7 @@ static const ber_sequence_t ResponseData_sequence[] = {
static int
dissect_ocsp_ResponseData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ResponseData_sequence, hf_index, ett_ocsp_ResponseData);
ResponseData_sequence, hf_index, ett_ocsp_ResponseData);
return offset;
}
@ -627,6 +641,7 @@ static int dissect_tbsResponseData(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_ocsp_ResponseData(FALSE, tvb, offset, pinfo, tree, hf_ocsp_tbsResponseData);
}
static const ber_sequence_t BasicOCSPResponse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tbsResponseData },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signatureAlgorithm },
@ -638,12 +653,13 @@ static const ber_sequence_t BasicOCSPResponse_sequence[] = {
static int
dissect_ocsp_BasicOCSPResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
BasicOCSPResponse_sequence, hf_index, ett_ocsp_BasicOCSPResponse);
BasicOCSPResponse_sequence, hf_index, ett_ocsp_BasicOCSPResponse);
return offset;
}
static int
dissect_ocsp_ArchiveCutoff(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -677,6 +693,7 @@ dissect_ocsp_AcceptableResponses(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
return offset;
}
static const ber_sequence_t ServiceLocator_sequence[] = {
{ BER_CLASS_ANY, -1, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_locator },
@ -686,17 +703,18 @@ static const ber_sequence_t ServiceLocator_sequence[] = {
static int
dissect_ocsp_ServiceLocator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ServiceLocator_sequence, hf_index, ett_ocsp_ServiceLocator);
ServiceLocator_sequence, hf_index, ett_ocsp_ServiceLocator);
return 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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -717,6 +735,7 @@ static int dissect_crlNum(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_ocsp_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_ocsp_crlNum);
}
static const ber_sequence_t CrlID_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_crlUrl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_crlNum },
@ -727,7 +746,7 @@ static const ber_sequence_t CrlID_sequence[] = {
static int
dissect_ocsp_CrlID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CrlID_sequence, hf_index, ett_ocsp_CrlID);
CrlID_sequence, hf_index, ett_ocsp_CrlID);
return offset;
}

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

@ -155,7 +155,8 @@ static const ber_choice_t TrustedCA_choice[] = {
static int
dissect_pkinit_TrustedCA(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
TrustedCA_choice, hf_index, ett_pkinit_TrustedCA, NULL);
TrustedCA_choice, hf_index, ett_pkinit_TrustedCA,
NULL);
return offset;
}
@ -165,7 +166,7 @@ static int dissect_trustedCertifiers_item(packet_info *pinfo, proto_tree *tree,
static const ber_sequence_t SEQUENCE_OF_TrustedCA_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_trustedCertifiers_item },
};
static int
@ -179,6 +180,7 @@ static int dissect_trustedCertifiers(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_pkinit_SEQUENCE_OF_TrustedCA(FALSE, tvb, offset, pinfo, tree, hf_pkinit_trustedCertifiers);
}
static const ber_sequence_t PaPkAsReq_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_signedAuthPack },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_trustedCertifiers },
@ -189,7 +191,7 @@ static const ber_sequence_t PaPkAsReq_sequence[] = {
static int
dissect_pkinit_PaPkAsReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PaPkAsReq_sequence, hf_index, ett_pkinit_PaPkAsReq);
PaPkAsReq_sequence, hf_index, ett_pkinit_PaPkAsReq);
return offset;
}
@ -223,6 +225,7 @@ static int dissect_paNonce(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_pkinit_INTEGER_0_4294967295(FALSE, tvb, offset, pinfo, tree, hf_pkinit_paNonce);
}
static const ber_sequence_t PKAuthenticator_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_cusec },
{ BER_CLASS_CON, 1, 0, dissect_ctime },
@ -234,7 +237,7 @@ static const ber_sequence_t PKAuthenticator_sequence[] = {
static int
dissect_pkinit_PKAuthenticator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PKAuthenticator_sequence, hf_index, ett_pkinit_PKAuthenticator);
PKAuthenticator_sequence, hf_index, ett_pkinit_PKAuthenticator);
return offset;
}
@ -258,6 +261,7 @@ static int dissect_supportedCMSTypes(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_pkinit_SEQUENCE_OF_AlgorithmIdentifier(FALSE, tvb, offset, pinfo, tree, hf_pkinit_supportedCMSTypes);
}
static const ber_sequence_t AuthPack_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_pkAuthenticator },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_clientPublicValue },
@ -268,7 +272,7 @@ static const ber_sequence_t AuthPack_sequence[] = {
static int
dissect_pkinit_AuthPack(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AuthPack_sequence, hf_index, ett_pkinit_AuthPack);
AuthPack_sequence, hf_index, ett_pkinit_AuthPack);
return offset;
}
@ -289,17 +293,19 @@ static const ber_choice_t PaPkAsRep_choice[] = {
static int
dissect_pkinit_PaPkAsRep(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep, NULL);
PaPkAsRep_choice, hf_index, ett_pkinit_PaPkAsRep,
NULL);
return offset;
}
static int
dissect_pkinit_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -307,6 +313,7 @@ static int dissect_subjectPublicKey(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_pkinit_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkinit_subjectPublicKey);
}
static const ber_sequence_t KDCDHKeyInfo_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_subjectPublicKey },
{ BER_CLASS_CON, 1, 0, dissect_dhNonce },
@ -317,7 +324,7 @@ static const ber_sequence_t KDCDHKeyInfo_sequence[] = {
static int
dissect_pkinit_KDCDHKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
KDCDHKeyInfo_sequence, hf_index, ett_pkinit_KDCDHKeyInfo);
KDCDHKeyInfo_sequence, hf_index, ett_pkinit_KDCDHKeyInfo);
return offset;
}

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

@ -202,6 +202,7 @@ static int dissect_extnValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_pkix1explicit_T_extnValue(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_extnValue);
}
static const ber_sequence_t Extension_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extnId },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical },
@ -212,7 +213,7 @@ static const ber_sequence_t Extension_sequence[] = {
int
dissect_pkix1explicit_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Extension_sequence, hf_index, ett_pkix1explicit_Extension);
Extension_sequence, hf_index, ett_pkix1explicit_Extension);
return offset;
}
@ -220,6 +221,7 @@ static int dissect_Extensions_item(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_pkix1explicit_Extension(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_Extensions_item);
}
static const ber_sequence_t Extensions_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_Extensions_item },
};
@ -227,7 +229,7 @@ static const ber_sequence_t Extensions_sequence_of[1] = {
int
dissect_pkix1explicit_Extensions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
Extensions_sequence_of, hf_index, ett_pkix1explicit_Extensions);
Extensions_sequence_of, hf_index, ett_pkix1explicit_Extensions);
return offset;
}
@ -258,11 +260,12 @@ static int dissect_pgenCounter(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
}
static int
dissect_pkix1explicit_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -270,6 +273,7 @@ static int dissect_seed(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_pkix1explicit_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_seed);
}
static const ber_sequence_t ValidationParms_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_seed },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pgenCounter },
@ -279,7 +283,7 @@ static const ber_sequence_t ValidationParms_sequence[] = {
static int
dissect_pkix1explicit_ValidationParms(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ValidationParms_sequence, hf_index, ett_pkix1explicit_ValidationParms);
ValidationParms_sequence, hf_index, ett_pkix1explicit_ValidationParms);
return offset;
}
@ -287,6 +291,7 @@ static int dissect_validationParms(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_pkix1explicit_ValidationParms(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_validationParms);
}
static const ber_sequence_t DomainParameters_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_p },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_g },
@ -299,7 +304,7 @@ static const ber_sequence_t DomainParameters_sequence[] = {
static int
dissect_pkix1explicit_DomainParameters(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DomainParameters_sequence, hf_index, ett_pkix1explicit_DomainParameters);
DomainParameters_sequence, hf_index, ett_pkix1explicit_DomainParameters);
return offset;
}
@ -333,6 +338,7 @@ static int dissect_value(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_pkix1explicit_T_value(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value);
}
static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
@ -342,7 +348,7 @@ static const ber_sequence_t AttributeTypeAndValue_sequence[] = {
int
dissect_pkix1explicit_AttributeTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AttributeTypeAndValue_sequence, hf_index, ett_pkix1explicit_AttributeTypeAndValue);
AttributeTypeAndValue_sequence, hf_index, ett_pkix1explicit_AttributeTypeAndValue);
return offset;
}
@ -350,6 +356,7 @@ static int dissect_RelativeDistinguishedName_item(packet_info *pinfo, proto_tree
return dissect_pkix1explicit_AttributeTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_RelativeDistinguishedName_item);
}
static const ber_sequence_t RelativeDistinguishedName_set_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_RelativeDistinguishedName_item },
};
@ -357,7 +364,7 @@ static const ber_sequence_t RelativeDistinguishedName_set_of[1] = {
int
dissect_pkix1explicit_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
RelativeDistinguishedName_set_of, hf_index, ett_pkix1explicit_RelativeDistinguishedName);
RelativeDistinguishedName_set_of, hf_index, ett_pkix1explicit_RelativeDistinguishedName);
return offset;
}
@ -365,6 +372,7 @@ static int dissect_RDNSequence_item(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_pkix1explicit_RelativeDistinguishedName(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_RDNSequence_item);
}
static const ber_sequence_t RDNSequence_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_RDNSequence_item },
};
@ -372,12 +380,13 @@ static const ber_sequence_t RDNSequence_sequence_of[1] = {
int
dissect_pkix1explicit_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
RDNSequence_sequence_of, hf_index, ett_pkix1explicit_RDNSequence);
RDNSequence_sequence_of, hf_index, ett_pkix1explicit_RDNSequence);
return offset;
}
int
dissect_pkix1explicit_DirectoryString(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);
@ -407,11 +416,12 @@ dissect_pkix1explicit_TerminalType(gboolean implicit_tag _U_, tvbuff_t *tvb, int
}
static int
dissect_pkix1explicit_TeletexString(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, BER_UNI_TAG_TeletexString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -422,6 +432,7 @@ static int dissect_value1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_pkix1explicit_TeletexString(FALSE, tvb, offset, pinfo, tree, hf_pkix1explicit_value1);
}
static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_type1 },
{ BER_CLASS_UNI, BER_UNI_TAG_TeletexString, BER_FLAGS_NOOWNTAG, dissect_value1 },
@ -431,7 +442,7 @@ static const ber_sequence_t TeletexDomainDefinedAttribute_sequence[] = {
int
dissect_pkix1explicit_TeletexDomainDefinedAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
TeletexDomainDefinedAttribute_sequence, hf_index, ett_pkix1explicit_TeletexDomainDefinedAttribute);
TeletexDomainDefinedAttribute_sequence, hf_index, ett_pkix1explicit_TeletexDomainDefinedAttribute);
return offset;
}
@ -523,7 +534,7 @@ void proto_register_pkix1explicit(void) {
"AttributeTypeAndValue/value", HFILL }},
{ &hf_pkix1explicit_RDNSequence_item,
{ "Item", "pkix1explicit.RDNSequence_item",
FT_NONE, BASE_NONE, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"RDNSequence/_item", HFILL }},
{ &hf_pkix1explicit_RelativeDistinguishedName_item,
{ "Item", "pkix1explicit.RelativeDistinguishedName_item",

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

@ -126,6 +126,7 @@ dissect_pkix1implicit_Dummy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
return offset;
}
static const ber_sequence_t 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 },
@ -135,7 +136,7 @@ static const ber_sequence_t EDIPartyName_sequence[] = {
static int
dissect_pkix1implicit_EDIPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
EDIPartyName_sequence, hf_index, ett_pkix1implicit_EDIPartyName);
EDIPartyName_sequence, hf_index, ett_pkix1implicit_EDIPartyName);
return offset;
}
@ -153,6 +154,7 @@ static int dissect_accessMethod(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_pkix1implicit_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_accessMethod);
}
static const ber_sequence_t AccessDescription_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_accessMethod },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_accessLocation },
@ -162,7 +164,7 @@ static const ber_sequence_t AccessDescription_sequence[] = {
static int
dissect_pkix1implicit_AccessDescription(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AccessDescription_sequence, hf_index, ett_pkix1implicit_AccessDescription);
AccessDescription_sequence, hf_index, ett_pkix1implicit_AccessDescription);
return offset;
}
@ -184,11 +186,12 @@ dissect_pkix1implicit_AuthorityInfoAccessSyntax(gboolean implicit_tag _U_, tvbuf
}
static int
dissect_pkix1implicit_VisibleString(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, BER_UNI_TAG_VisibleString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -197,11 +200,12 @@ static int dissect_visibleString(packet_info *pinfo, proto_tree *tree, tvbuff_t
}
static int
dissect_pkix1implicit_BMPString(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, BER_UNI_TAG_BMPString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -210,11 +214,12 @@ static int dissect_bmpString(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
}
static int
dissect_pkix1implicit_UTF8String(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, BER_UNI_TAG_UTF8String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -240,7 +245,8 @@ static const ber_choice_t DisplayText_choice[] = {
static int
dissect_pkix1implicit_DisplayText(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText, NULL);
DisplayText_choice, hf_index, ett_pkix1implicit_DisplayText,
NULL);
return offset;
}
@ -280,8 +286,9 @@ static int dissect_noticeNumbers(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkix1implicit_T_noticeNumbers(FALSE, tvb, offset, pinfo, tree, hf_pkix1implicit_noticeNumbers);
}
static const ber_sequence_t NoticeReference_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_organization },
{ BER_CLASS_ANY/*choice*/, -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 }
};
@ -289,7 +296,7 @@ static const ber_sequence_t NoticeReference_sequence[] = {
static int
dissect_pkix1implicit_NoticeReference(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
NoticeReference_sequence, hf_index, ett_pkix1implicit_NoticeReference);
NoticeReference_sequence, hf_index, ett_pkix1implicit_NoticeReference);
return offset;
}
@ -297,16 +304,17 @@ 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 const ber_sequence_t 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 },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_explicitText },
{ 0, 0, 0, NULL }
};
int
dissect_pkix1implicit_UserNotice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
UserNotice_sequence, hf_index, ett_pkix1implicit_UserNotice);
UserNotice_sequence, hf_index, ett_pkix1implicit_UserNotice);
return offset;
}

26
epan/dissectors/packet-pkixqualified.c
View File

@ -109,6 +109,7 @@ static int dissect_NameRegistrationAuthorities_item(packet_info *pinfo, proto_tr
}
static int
dissect_pkixqualified_Generalizedtime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -117,6 +118,7 @@ dissect_pkixqualified_Generalizedtime(gboolean implicit_tag _U_, tvbuff_t *tvb,
}
static int
dissect_pkixqualified_Directorystring(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509sat_DirectoryString(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -125,11 +127,12 @@ dissect_pkixqualified_Directorystring(gboolean implicit_tag _U_, tvbuff_t *tvb,
}
static int
dissect_pkixqualified_Printablestring(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, BER_UNI_TAG_PrintableString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -185,7 +188,8 @@ static const ber_choice_t TypeOfBiometricData_choice[] = {
static int
dissect_pkixqualified_TypeOfBiometricData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData, NULL);
TypeOfBiometricData_choice, hf_index, ett_pkixqualified_TypeOfBiometricData,
NULL);
return offset;
}
@ -207,11 +211,12 @@ static int dissect_biometricDataHash(packet_info *pinfo, proto_tree *tree, tvbuf
}
static int
dissect_pkixqualified_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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -219,8 +224,9 @@ static int dissect_sourceDataUri(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkixqualified_IA5String(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_sourceDataUri);
}
static const ber_sequence_t BiometricData_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeOfBiometricData },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_typeOfBiometricData },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_biometricDataHash },
{ BER_CLASS_UNI, BER_UNI_TAG_IA5String, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_sourceDataUri },
@ -230,7 +236,7 @@ static const ber_sequence_t BiometricData_sequence[] = {
static int
dissect_pkixqualified_BiometricData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
BiometricData_sequence, hf_index, ett_pkixqualified_BiometricData);
BiometricData_sequence, hf_index, ett_pkixqualified_BiometricData);
return offset;
}
@ -278,6 +284,7 @@ static int dissect_statementInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkixqualified_T_statementInfo(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_statementInfo);
}
static const ber_sequence_t QCStatement_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_statementId },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_statementInfo },
@ -287,7 +294,7 @@ static const ber_sequence_t QCStatement_sequence[] = {
static int
dissect_pkixqualified_QCStatement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
QCStatement_sequence, hf_index, ett_pkixqualified_QCStatement);
QCStatement_sequence, hf_index, ett_pkixqualified_QCStatement);
return offset;
}
@ -324,6 +331,7 @@ static int dissect_nameRegistrationAuthorities(packet_info *pinfo, proto_tree *t
return dissect_pkixqualified_NameRegistrationAuthorities(FALSE, tvb, offset, pinfo, tree, hf_pkixqualified_nameRegistrationAuthorities);
}
static const ber_sequence_t SemanticsInformation_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_semanticsIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_nameRegistrationAuthorities },
@ -333,7 +341,7 @@ static const ber_sequence_t SemanticsInformation_sequence[] = {
static int
dissect_pkixqualified_SemanticsInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SemanticsInformation_sequence, hf_index, ett_pkixqualified_SemanticsInformation);
SemanticsInformation_sequence, hf_index, ett_pkixqualified_SemanticsInformation);
return offset;
}

65
epan/dissectors/packet-pkixtsp.c
View File

@ -131,7 +131,8 @@ static const value_string pkixtsp_T_version_vals[] = {
static int
dissect_pkixtsp_T_version(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;
}
@ -140,10 +141,11 @@ static int dissect_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
}
static int
dissect_pkixtsp_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;
}
@ -151,6 +153,7 @@ static int dissect_hashedMessage(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkixtsp_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_hashedMessage);
}
static const ber_sequence_t MessageImprint_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_hashAlgorithm },
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_hashedMessage },
@ -160,7 +163,7 @@ static const ber_sequence_t MessageImprint_sequence[] = {
static int
dissect_pkixtsp_MessageImprint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MessageImprint_sequence, hf_index, ett_pkixtsp_MessageImprint);
MessageImprint_sequence, hf_index, ett_pkixtsp_MessageImprint);
return offset;
}
@ -169,10 +172,11 @@ static int dissect_messageImprint(packet_info *pinfo, proto_tree *tree, tvbuff_t
}
static int
dissect_pkixtsp_TSAPolicyId(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;
}
@ -187,7 +191,8 @@ static int dissect_policy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
static int
dissect_pkixtsp_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;
}
@ -202,6 +207,7 @@ static int dissect_seconds(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
}
static int
dissect_pkixtsp_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);
@ -215,6 +221,7 @@ static int dissect_ordering(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_pkixtsp_BOOLEAN(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_ordering);
}
static const ber_sequence_t TimeStampReq_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_messageImprint },
@ -228,7 +235,7 @@ static const ber_sequence_t TimeStampReq_sequence[] = {
static int
dissect_pkixtsp_TimeStampReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
TimeStampReq_sequence, hf_index, ett_pkixtsp_TimeStampReq);
TimeStampReq_sequence, hf_index, ett_pkixtsp_TimeStampReq);
return offset;
}
@ -247,7 +254,8 @@ static const value_string pkixtsp_PKIStatus_vals[] = {
static int
dissect_pkixtsp_PKIStatus(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;
}
@ -255,23 +263,24 @@ static int dissect_pki_status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_pkixtsp_PKIStatus(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_pki_status);
}
static const asn_namedbit PKIFailureInfo_bits[] = {
{ 0, &hf_pkixtsp_PKIFailureInfo_badAlg, -1, -1, NULL, NULL },
{ 2, &hf_pkixtsp_PKIFailureInfo_badRequest, -1, -1, NULL, NULL },
{ 5, &hf_pkixtsp_PKIFailureInfo_badDataFormat, -1, -1, NULL, NULL },
{ 14, &hf_pkixtsp_PKIFailureInfo_timeNotAvailable, -1, -1, NULL, NULL },
{ 15, &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy, -1, -1, NULL, NULL },
{ 16, &hf_pkixtsp_PKIFailureInfo_unacceptedExtension, -1, -1, NULL, NULL },
{ 17, &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable, -1, -1, NULL, NULL },
{ 25, &hf_pkixtsp_PKIFailureInfo_systemFailure, -1, -1, NULL, NULL },
{ 0, &hf_pkixtsp_PKIFailureInfo_badAlg, -1, -1, "badAlg", NULL },
{ 2, &hf_pkixtsp_PKIFailureInfo_badRequest, -1, -1, "badRequest", NULL },
{ 5, &hf_pkixtsp_PKIFailureInfo_badDataFormat, -1, -1, "badDataFormat", NULL },
{ 14, &hf_pkixtsp_PKIFailureInfo_timeNotAvailable, -1, -1, "timeNotAvailable", NULL },
{ 15, &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy, -1, -1, "unacceptedPolicy", NULL },
{ 16, &hf_pkixtsp_PKIFailureInfo_unacceptedExtension, -1, -1, "unacceptedExtension", NULL },
{ 17, &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable, -1, -1, "addInfoNotAvailable", NULL },
{ 25, &hf_pkixtsp_PKIFailureInfo_systemFailure, -1, -1, "systemFailure", NULL },
{ 0, NULL, 0, 0, NULL, NULL }
};
static int
dissect_pkixtsp_PKIFailureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
PKIFailureInfo_bits, hf_index, ett_pkixtsp_PKIFailureInfo,
NULL);
PKIFailureInfo_bits, hf_index, ett_pkixtsp_PKIFailureInfo,
NULL);
return offset;
}
@ -279,6 +288,7 @@ static int dissect_failInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_pkixtsp_PKIFailureInfo(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_failInfo);
}
static const ber_sequence_t PKIStatusInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_pki_status },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_failInfo },
@ -288,7 +298,7 @@ static const ber_sequence_t PKIStatusInfo_sequence[] = {
static int
dissect_pkixtsp_PKIStatusInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PKIStatusInfo_sequence, hf_index, ett_pkixtsp_PKIStatusInfo);
PKIStatusInfo_sequence, hf_index, ett_pkixtsp_PKIStatusInfo);
return offset;
}
@ -297,6 +307,7 @@ static int dissect_status(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
}
static int
dissect_pkixtsp_TimeStampToken(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_cms_ContentInfo(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -307,6 +318,7 @@ static int dissect_timeStampToken(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_pkixtsp_TimeStampToken(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_timeStampToken);
}
static const ber_sequence_t TimeStampResp_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_status },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeStampToken },
@ -316,7 +328,7 @@ static const ber_sequence_t TimeStampResp_sequence[] = {
static int
dissect_pkixtsp_TimeStampResp(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
TimeStampResp_sequence, hf_index, ett_pkixtsp_TimeStampResp);
TimeStampResp_sequence, hf_index, ett_pkixtsp_TimeStampResp);
return offset;
}
@ -330,7 +342,8 @@ static const value_string pkixtsp_tst_version_vals[] = {
static int
dissect_pkixtsp_tst_version(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;
}
@ -339,6 +352,7 @@ static int dissect_tst_version(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
}
static int
dissect_pkixtsp_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -353,7 +367,8 @@ static int dissect_genTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
static int
dissect_pkixtsp_INTEGER_1_999(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;
}
@ -364,6 +379,7 @@ static int dissect_micros_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_pkixtsp_INTEGER_1_999(TRUE, tvb, offset, pinfo, tree, hf_pkixtsp_micros);
}
static const ber_sequence_t Accuracy_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_seconds },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_millis_impl },
@ -374,7 +390,7 @@ static const ber_sequence_t Accuracy_sequence[] = {
static int
dissect_pkixtsp_Accuracy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Accuracy_sequence, hf_index, ett_pkixtsp_Accuracy);
Accuracy_sequence, hf_index, ett_pkixtsp_Accuracy);
return offset;
}
@ -382,6 +398,7 @@ static int dissect_accuracy(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_pkixtsp_Accuracy(FALSE, tvb, offset, pinfo, tree, hf_pkixtsp_accuracy);
}
static const ber_sequence_t TSTInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_tst_version },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policy },
@ -399,7 +416,7 @@ static const ber_sequence_t TSTInfo_sequence[] = {
static int
dissect_pkixtsp_TSTInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
TSTInfo_sequence, hf_index, ett_pkixtsp_TSTInfo);
TSTInfo_sequence, hf_index, ett_pkixtsp_TSTInfo);
return offset;
}

41
epan/dissectors/packet-smrse.c
View File

@ -172,6 +172,7 @@ dissect_smrse_SemiOctetString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
}
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];
@ -223,7 +224,8 @@ static const ber_choice_t T_address_value_choice[] = {
static int
dissect_smrse_T_address_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
T_address_value_choice, hf_index, ett_smrse_T_address_value, NULL);
T_address_value_choice, hf_index, ett_smrse_T_address_value,
NULL);
return offset;
}
@ -231,17 +233,18 @@ static int dissect_address_value(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_smrse_T_address_value(FALSE, tvb, offset, pinfo, tree, hf_smrse_address_value);
}
static const ber_sequence_t SMS_Address_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_address_type },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_numbering_plan },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address_value },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_address_value },
{ 0, 0, 0, NULL }
};
static int
dissect_smrse_SMS_Address(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SMS_Address_sequence, hf_index, ett_smrse_SMS_Address);
SMS_Address_sequence, hf_index, ett_smrse_SMS_Address);
return offset;
}
@ -271,11 +274,12 @@ static int dissect_ms_address(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
}
static int
dissect_smrse_Password(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, BER_UNI_TAG_PrintableString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -283,6 +287,7 @@ static int dissect_password(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_smrse_Password(FALSE, tvb, offset, pinfo, tree, hf_smrse_password);
}
static const ber_sequence_t SMR_Bind_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_sc_address },
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_password },
@ -292,7 +297,7 @@ static const ber_sequence_t SMR_Bind_sequence[] = {
static int
dissect_smrse_SMR_Bind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SMR_Bind_sequence, hf_index, ett_smrse_SMR_Bind);
SMR_Bind_sequence, hf_index, ett_smrse_SMR_Bind);
return offset;
}
@ -310,6 +315,7 @@ static int dissect_moimsi_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_smrse_IMSI_Address(TRUE, tvb, offset, pinfo, tree, hf_smrse_moimsi);
}
static const ber_sequence_t SMR_Bind_Confirm_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -317,7 +323,7 @@ static const ber_sequence_t SMR_Bind_Confirm_sequence[] = {
static int
dissect_smrse_SMR_Bind_Confirm(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SMR_Bind_Confirm_sequence, hf_index, ett_smrse_SMR_Bind_Confirm);
SMR_Bind_Confirm_sequence, hf_index, ett_smrse_SMR_Bind_Confirm);
return offset;
}
@ -345,6 +351,7 @@ static int dissect_connect_fail_reason(packet_info *pinfo, proto_tree *tree, tvb
return dissect_smrse_Connect_fail(FALSE, tvb, offset, pinfo, tree, hf_smrse_connect_fail_reason);
}
static const ber_sequence_t SMR_Bind_Failure_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_connect_fail_reason },
{ 0, 0, 0, NULL }
@ -353,11 +360,12 @@ static const ber_sequence_t SMR_Bind_Failure_sequence[] = {
static int
dissect_smrse_SMR_Bind_Failure(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SMR_Bind_Failure_sequence, hf_index, ett_smrse_SMR_Bind_Failure);
SMR_Bind_Failure_sequence, hf_index, ett_smrse_SMR_Bind_Failure);
return offset;
}
static const ber_sequence_t SMR_Unbind_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -365,7 +373,7 @@ static const ber_sequence_t SMR_Unbind_sequence[] = {
static int
dissect_smrse_SMR_Unbind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SMR_Unbind_sequence, hf_index, ett_smrse_SMR_Unbind);
SMR_Unbind_sequence, hf_index, ett_smrse_SMR_Unbind);
return offset;
}
@ -439,6 +447,7 @@ static int dissect_mt_tariffClass_impl(packet_info *pinfo, proto_tree *tree, tvb
return dissect_smrse_SM_TC(TRUE, tvb, offset, pinfo, tree, hf_smrse_mt_tariffClass);
}
static const ber_sequence_t RPDataMT_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_mt_priority_request },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_mt_mms },
@ -454,11 +463,12 @@ static const ber_sequence_t RPDataMT_sequence[] = {
static int
dissect_smrse_RPDataMT(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RPDataMT_sequence, hf_index, ett_smrse_RPDataMT);
RPDataMT_sequence, hf_index, ett_smrse_RPDataMT);
return offset;
}
static const ber_sequence_t RPDataMO_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_mo_message_reference },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mo_originating_address },
@ -471,11 +481,12 @@ static const ber_sequence_t RPDataMO_sequence[] = {
static int
dissect_smrse_RPDataMO(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RPDataMO_sequence, hf_index, ett_smrse_RPDataMO);
RPDataMO_sequence, hf_index, ett_smrse_RPDataMO);
return offset;
}
static const ber_sequence_t RPAck_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference },
{ 0, 0, 0, NULL }
@ -484,7 +495,7 @@ static const ber_sequence_t RPAck_sequence[] = {
static int
dissect_smrse_RPAck(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RPAck_sequence, hf_index, ett_smrse_RPAck);
RPAck_sequence, hf_index, ett_smrse_RPAck);
return offset;
}
@ -525,6 +536,7 @@ static int dissect_error_reason(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_smrse_Error_reason(FALSE, tvb, offset, pinfo, tree, hf_smrse_error_reason);
}
static const ber_sequence_t RPError_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_error_reason },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_NOOWNTAG, dissect_msg_waiting_set },
@ -537,11 +549,12 @@ static const ber_sequence_t RPError_sequence[] = {
static int
dissect_smrse_RPError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RPError_sequence, hf_index, ett_smrse_RPError);
RPError_sequence, hf_index, ett_smrse_RPError);
return offset;
}
static const ber_sequence_t RPAlertSC_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ms_address },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_message_reference },
@ -551,7 +564,7 @@ static const ber_sequence_t RPAlertSC_sequence[] = {
static int
dissect_smrse_RPAlertSC(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RPAlertSC_sequence, hf_index, ett_smrse_RPAlertSC);
RPAlertSC_sequence, hf_index, ett_smrse_RPAlertSC);
return offset;
}

5
epan/dissectors/packet-wlancertextn.c
View File

@ -90,6 +90,7 @@ static int dissect_SSIDList_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_wlancertextn_SSID(FALSE, tvb, offset, pinfo, tree, hf_wlancertextn_SSIDList_item);
}
static const ber_sequence_t SSIDList_sequence_of[1] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_SSIDList_item },
};
@ -97,7 +98,7 @@ static const ber_sequence_t SSIDList_sequence_of[1] = {
static int
dissect_wlancertextn_SSIDList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
SSIDList_sequence_of, hf_index, ett_wlancertextn_SSIDList);
SSIDList_sequence_of, hf_index, ett_wlancertextn_SSIDList);
return offset;
}
@ -123,7 +124,7 @@ void proto_register_wlancertextn(void) {
{ &hf_wlancertextn_SSIDList_PDU,
{ "SSIDList", "wlancertextn.SSIDList",
FT_NONE, BASE_NONE, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"SSIDList", HFILL }},
{ &hf_wlancertextn_SSIDList_item,
{ "Item", "wlancertextn.SSIDList_item",

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

@ -284,6 +284,7 @@ static int dissect_parameters(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509af_T_parameters(FALSE, tvb, offset, pinfo, tree, hf_x509af_parameters);
}
static const ber_sequence_t AlgorithmIdentifier_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_algorithmId },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_parameters },
@ -293,7 +294,7 @@ static const ber_sequence_t AlgorithmIdentifier_sequence[] = {
int
dissect_x509af_AlgorithmIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AlgorithmIdentifier_sequence, hf_index, ett_x509af_AlgorithmIdentifier);
AlgorithmIdentifier_sequence, hf_index, ett_x509af_AlgorithmIdentifier);
return offset;
}
@ -308,11 +309,12 @@ static int dissect_algorithm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
}
static int
dissect_x509af_UTCTime(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, BER_UNI_TAG_UTCTime,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -321,6 +323,7 @@ static int dissect_utcTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
}
static int
dissect_x509af_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -356,7 +359,8 @@ static const ber_choice_t Time_choice[] = {
int
dissect_x509af_Time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
Time_choice, hf_index, ett_x509af_Time, NULL);
Time_choice, hf_index, ett_x509af_Time,
NULL);
return offset;
}
@ -376,16 +380,17 @@ 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 const ber_sequence_t 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 },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notBefore },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_notAfter },
{ 0, 0, 0, NULL }
};
int
dissect_x509af_Validity(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Validity_sequence, hf_index, ett_x509af_Validity);
Validity_sequence, hf_index, ett_x509af_Validity);
return offset;
}
@ -394,11 +399,12 @@ static int dissect_validity(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
}
static int
dissect_x509af_BIT_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -409,6 +415,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 const ber_sequence_t 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 },
@ -418,7 +425,7 @@ static const ber_sequence_t SubjectPublicKeyInfo_sequence[] = {
int
dissect_x509af_SubjectPublicKeyInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SubjectPublicKeyInfo_sequence, hf_index, ett_x509af_SubjectPublicKeyInfo);
SubjectPublicKeyInfo_sequence, hf_index, ett_x509af_SubjectPublicKeyInfo);
return offset;
}
@ -472,6 +479,7 @@ static int dissect_extnValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_x509af_T_extnValue(FALSE, tvb, offset, pinfo, tree, hf_x509af_extnValue);
}
static const ber_sequence_t Extension_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_extnId },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_critical },
@ -482,7 +490,7 @@ static const ber_sequence_t Extension_sequence[] = {
int
dissect_x509af_Extension(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Extension_sequence, hf_index, ett_x509af_Extension);
Extension_sequence, hf_index, ett_x509af_Extension);
return offset;
}
@ -512,6 +520,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 const ber_sequence_t T_signedCertificate_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_version },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
@ -529,7 +538,7 @@ static const ber_sequence_t T_signedCertificate_sequence[] = {
static int
dissect_x509af_T_signedCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
T_signedCertificate_sequence, hf_index, ett_x509af_T_signedCertificate);
T_signedCertificate_sequence, hf_index, ett_x509af_T_signedCertificate);
return offset;
}
@ -537,6 +546,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 const ber_sequence_t 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 },
@ -547,7 +557,7 @@ static const ber_sequence_t Certificate_sequence[] = {
int
dissect_x509af_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Certificate_sequence, hf_index, ett_x509af_Certificate);
Certificate_sequence, hf_index, ett_x509af_Certificate);
return offset;
}
@ -599,6 +609,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 const ber_sequence_t 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 },
@ -608,11 +619,12 @@ static const ber_sequence_t Certificates_sequence[] = {
int
dissect_x509af_Certificates(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Certificates_sequence, hf_index, ett_x509af_Certificates);
Certificates_sequence, hf_index, ett_x509af_Certificates);
return offset;
}
static const ber_sequence_t CertificatePair_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_issuedByThisCA },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_issuedToThisCA },
@ -622,7 +634,7 @@ static const ber_sequence_t CertificatePair_sequence[] = {
int
dissect_x509af_CertificatePair(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertificatePair_sequence, hf_index, ett_x509af_CertificatePair);
CertificatePair_sequence, hf_index, ett_x509af_CertificatePair);
return offset;
}
@ -646,6 +658,7 @@ static int dissect_theCACertificates(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509af_SEQUENCE_OF_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates);
}
static const ber_sequence_t 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 },
@ -655,14 +668,15 @@ static const ber_sequence_t CertificationPath_sequence[] = {
int
dissect_x509af_CertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertificationPath_sequence, hf_index, ett_x509af_CertificationPath);
CertificationPath_sequence, hf_index, ett_x509af_CertificationPath);
return offset;
}
static const ber_sequence_t T_revokedCertificates_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_revokedUserCertificate },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_revocationDate },
{ BER_CLASS_ANY/*choice*/, -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 },
{ 0, 0, 0, NULL }
};
@ -670,7 +684,7 @@ static const ber_sequence_t T_revokedCertificates_item_sequence[] = {
static int
dissect_x509af_T_revokedCertificates_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
T_revokedCertificates_item_sequence, hf_index, ett_x509af_T_revokedCertificates_item);
T_revokedCertificates_item_sequence, hf_index, ett_x509af_T_revokedCertificates_item);
return offset;
}
@ -694,12 +708,13 @@ 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 const ber_sequence_t 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_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_thisUpdate },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_nextUpdate },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_thisUpdate },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_nextUpdate },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_revokedCertificates },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_crlExtensions },
{ 0, 0, 0, NULL }
@ -708,7 +723,7 @@ static const ber_sequence_t T_signedCertificateList_sequence[] = {
static int
dissect_x509af_T_signedCertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
T_signedCertificateList_sequence, hf_index, ett_x509af_T_signedCertificateList);
T_signedCertificateList_sequence, hf_index, ett_x509af_T_signedCertificateList);
return offset;
}
@ -716,6 +731,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 const ber_sequence_t 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 },
@ -726,11 +742,12 @@ static const ber_sequence_t CertificateList_sequence[] = {
int
dissect_x509af_CertificateList(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertificateList_sequence, hf_index, ett_x509af_CertificateList);
CertificateList_sequence, hf_index, ett_x509af_CertificateList);
return offset;
}
static const ber_sequence_t IssuerSerial_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serial },
@ -741,7 +758,7 @@ static const ber_sequence_t IssuerSerial_sequence[] = {
int
dissect_x509af_IssuerSerial(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
IssuerSerial_sequence, hf_index, ett_x509af_IssuerSerial);
IssuerSerial_sequence, hf_index, ett_x509af_IssuerSerial);
return offset;
}
@ -765,7 +782,8 @@ static const ber_choice_t InfoSubject_choice[] = {
static int
dissect_x509af_InfoSubject(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
InfoSubject_choice, hf_index, ett_x509af_InfoSubject, NULL);
InfoSubject_choice, hf_index, ett_x509af_InfoSubject,
NULL);
return offset;
}
@ -773,6 +791,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 const ber_sequence_t 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 },
@ -782,7 +801,7 @@ static const ber_sequence_t AttCertValidityPeriod_sequence[] = {
int
dissect_x509af_AttCertValidityPeriod(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AttCertValidityPeriod_sequence, hf_index, ett_x509af_AttCertValidityPeriod);
AttCertValidityPeriod_sequence, hf_index, ett_x509af_AttCertValidityPeriod);
return offset;
}
@ -806,9 +825,10 @@ static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509af_SEQUENCE_OF_Attribute(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributes);
}
static const ber_sequence_t 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_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_info_subject },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_issuerName },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_signature },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
@ -822,7 +842,7 @@ static const ber_sequence_t AttributeCertificateInfo_sequence[] = {
int
dissect_x509af_AttributeCertificateInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AttributeCertificateInfo_sequence, hf_index, ett_x509af_AttributeCertificateInfo);
AttributeCertificateInfo_sequence, hf_index, ett_x509af_AttributeCertificateInfo);
return offset;
}
@ -830,6 +850,7 @@ static int dissect_signedAttributeCertificateInfo(packet_info *pinfo, proto_tree
return dissect_x509af_AttributeCertificateInfo(FALSE, tvb, offset, pinfo, tree, hf_x509af_signedAttributeCertificateInfo);
}
static const ber_sequence_t 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 },
@ -840,7 +861,7 @@ static const ber_sequence_t AttributeCertificate_sequence[] = {
int
dissect_x509af_AttributeCertificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AttributeCertificate_sequence, hf_index, ett_x509af_AttributeCertificate);
AttributeCertificate_sequence, hf_index, ett_x509af_AttributeCertificate);
return offset;
}
@ -848,6 +869,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 const ber_sequence_t ACPathData_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_certificate },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_attributeCertificate },
@ -857,7 +879,7 @@ static const ber_sequence_t ACPathData_sequence[] = {
int
dissect_x509af_ACPathData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ACPathData_sequence, hf_index, ett_x509af_ACPathData);
ACPathData_sequence, hf_index, ett_x509af_ACPathData);
return offset;
}
@ -881,6 +903,7 @@ static int dissect_acPath(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_x509af_SEQUENCE_OF_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath);
}
static const ber_sequence_t 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 },
@ -890,7 +913,7 @@ static const ber_sequence_t AttributeCertificationPath_sequence[] = {
int
dissect_x509af_AttributeCertificationPath(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AttributeCertificationPath_sequence, hf_index, ett_x509af_AttributeCertificationPath);
AttributeCertificationPath_sequence, hf_index, ett_x509af_AttributeCertificationPath);
return offset;
}
@ -911,7 +934,8 @@ static const ber_choice_t AssertionSubject_choice[] = {
static int
dissect_x509af_AssertionSubject(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject, NULL);
AssertionSubject_choice, hf_index, ett_x509af_AssertionSubject,
NULL);
return offset;
}
@ -935,6 +959,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 const ber_sequence_t AttributeCertificateAssertion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_assertion_subject },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_assertionIssuer },
@ -946,7 +971,7 @@ static const ber_sequence_t AttributeCertificateAssertion_sequence[] = {
int
dissect_x509af_AttributeCertificateAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AttributeCertificateAssertion_sequence, hf_index, ett_x509af_AttributeCertificateAssertion);
AttributeCertificateAssertion_sequence, hf_index, ett_x509af_AttributeCertificateAssertion);
return offset;
}

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

@ -324,11 +324,12 @@ static int dissect_keyIdentifier_impl(packet_info *pinfo, proto_tree *tree, tvbu
}
static int
dissect_x509ce_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, BER_UNI_TAG_IA5String,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -342,6 +343,7 @@ static int dissect_uniformResourceIdentifier_impl(packet_info *pinfo, proto_tree
return dissect_x509ce_IA5String(TRUE, tvb, offset, pinfo, tree, hf_x509ce_uniformResourceIdentifier);
}
static const ber_sequence_t 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 },
@ -351,7 +353,7 @@ static const ber_sequence_t EDIPartyName_sequence[] = {
int
dissect_x509ce_EDIPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
EDIPartyName_sequence, hf_index, ett_x509ce_EDIPartyName);
EDIPartyName_sequence, hf_index, ett_x509ce_EDIPartyName);
return offset;
}
@ -418,7 +420,8 @@ static const ber_choice_t GeneralName_choice[] = {
int
dissect_x509ce_GeneralName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
GeneralName_choice, hf_index, ett_x509ce_GeneralName, NULL);
GeneralName_choice, hf_index, ett_x509ce_GeneralName,
NULL);
return offset;
}
@ -443,7 +446,7 @@ static int dissect_deltaLocation(packet_info *pinfo, proto_tree *tree, tvbuff_t
static const ber_sequence_t GeneralNames_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_GeneralNames_item },
};
int
@ -466,6 +469,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 const ber_sequence_t 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 },
@ -476,7 +480,7 @@ static const ber_sequence_t AuthorityKeyIdentifier_sequence[] = {
int
dissect_x509ce_AuthorityKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AuthorityKeyIdentifier_sequence, hf_index, ett_x509ce_AuthorityKeyIdentifier);
AuthorityKeyIdentifier_sequence, hf_index, ett_x509ce_AuthorityKeyIdentifier);
return offset;
}
@ -485,6 +489,7 @@ static int dissect_authorityKeyIdentifier_impl(packet_info *pinfo, proto_tree *t
}
int
dissect_x509ce_SubjectKeyIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509ce_KeyIdentifier(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -495,6 +500,7 @@ static int dissect_subjectKeyIdentifier_impl(packet_info *pinfo, proto_tree *tre
return dissect_x509ce_SubjectKeyIdentifier(TRUE, tvb, offset, pinfo, tree, hf_x509ce_subjectKeyIdentifier);
}
static const asn_namedbit KeyUsage_bits[] = {
{ 0, &hf_x509ce_KeyUsage_digitalSignature, -1, -1, "digitalSignature", NULL },
{ 1, &hf_x509ce_KeyUsage_nonRepudiation, -1, -1, "nonRepudiation", NULL },
@ -511,8 +517,8 @@ static const asn_namedbit KeyUsage_bits[] = {
int
dissect_x509ce_KeyUsage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
KeyUsage_bits, hf_index, ett_x509ce_KeyUsage,
NULL);
KeyUsage_bits, hf_index, ett_x509ce_KeyUsage,
NULL);
return offset;
}
@ -547,6 +553,7 @@ dissect_x509ce_KeyPurposeIDs(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
}
static int
dissect_x509ce_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -578,6 +585,7 @@ static int dissect_privateKeyValid_impl(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509ce_GeneralizedTime(TRUE, tvb, offset, pinfo, tree, hf_x509ce_privateKeyValid);
}
static const ber_sequence_t 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 },
@ -587,7 +595,7 @@ static const ber_sequence_t PrivateKeyUsagePeriod_sequence[] = {
int
dissect_x509ce_PrivateKeyUsagePeriod(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PrivateKeyUsagePeriod_sequence, hf_index, ett_x509ce_PrivateKeyUsagePeriod);
PrivateKeyUsagePeriod_sequence, hf_index, ett_x509ce_PrivateKeyUsagePeriod);
return offset;
}
@ -641,6 +649,7 @@ static int dissect_qualifier(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_x509ce_PolicyQualifierValue(FALSE, tvb, offset, pinfo, tree, hf_x509ce_qualifier);
}
static const ber_sequence_t PolicyQualifierInfo_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_policyQualifierId },
{ BER_CLASS_ANY, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_qualifier },
@ -650,7 +659,7 @@ static const ber_sequence_t PolicyQualifierInfo_sequence[] = {
int
dissect_x509ce_PolicyQualifierInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PolicyQualifierInfo_sequence, hf_index, ett_x509ce_PolicyQualifierInfo);
PolicyQualifierInfo_sequence, hf_index, ett_x509ce_PolicyQualifierInfo);
return offset;
}
@ -674,6 +683,7 @@ static int dissect_policyQualifiers(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers);
}
static const ber_sequence_t 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 },
@ -683,7 +693,7 @@ static const ber_sequence_t PolicyInformation_sequence[] = {
int
dissect_x509ce_PolicyInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PolicyInformation_sequence, hf_index, ett_x509ce_PolicyInformation);
PolicyInformation_sequence, hf_index, ett_x509ce_PolicyInformation);
return offset;
}
@ -704,6 +714,7 @@ dissect_x509ce_CertificatePoliciesSyntax(gboolean implicit_tag _U_, tvbuff_t *tv
return offset;
}
static const ber_sequence_t 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 },
@ -713,7 +724,7 @@ static const ber_sequence_t PolicyMappingsSyntax_item_sequence[] = {
static int
dissect_x509ce_PolicyMappingsSyntax_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PolicyMappingsSyntax_item_sequence, hf_index, ett_x509ce_PolicyMappingsSyntax_item);
PolicyMappingsSyntax_item_sequence, hf_index, ett_x509ce_PolicyMappingsSyntax_item);
return offset;
}
@ -799,6 +810,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 const ber_sequence_t 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 },
@ -808,7 +820,7 @@ static const ber_sequence_t BasicConstraintsSyntax_sequence[] = {
int
dissect_x509ce_BasicConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
BasicConstraintsSyntax_sequence, hf_index, ett_x509ce_BasicConstraintsSyntax);
BasicConstraintsSyntax_sequence, hf_index, ett_x509ce_BasicConstraintsSyntax);
return offset;
}
@ -829,8 +841,9 @@ 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 const ber_sequence_t GeneralSubtree_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_base },
{ BER_CLASS_ANY/*choice*/, -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 },
{ 0, 0, 0, NULL }
@ -839,7 +852,7 @@ static const ber_sequence_t GeneralSubtree_sequence[] = {
int
dissect_x509ce_GeneralSubtree(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
GeneralSubtree_sequence, hf_index, ett_x509ce_GeneralSubtree);
GeneralSubtree_sequence, hf_index, ett_x509ce_GeneralSubtree);
return offset;
}
@ -866,6 +879,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 const ber_sequence_t 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 },
@ -875,7 +889,7 @@ static const ber_sequence_t NameConstraintsSyntax_sequence[] = {
int
dissect_x509ce_NameConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
NameConstraintsSyntax_sequence, hf_index, ett_x509ce_NameConstraintsSyntax);
NameConstraintsSyntax_sequence, hf_index, ett_x509ce_NameConstraintsSyntax);
return offset;
}
@ -899,6 +913,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 const ber_sequence_t 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 },
@ -908,7 +923,7 @@ static const ber_sequence_t PolicyConstraintsSyntax_sequence[] = {
int
dissect_x509ce_PolicyConstraintsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PolicyConstraintsSyntax_sequence, hf_index, ett_x509ce_PolicyConstraintsSyntax);
PolicyConstraintsSyntax_sequence, hf_index, ett_x509ce_PolicyConstraintsSyntax);
return offset;
}
@ -982,7 +997,8 @@ static const ber_choice_t DistributionPointName_choice[] = {
int
dissect_x509ce_DistributionPointName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName, NULL);
DistributionPointName_choice, hf_index, ett_x509ce_DistributionPointName,
NULL);
return offset;
}
@ -993,6 +1009,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 const asn_namedbit OnlyCertificateTypes_bits[] = {
{ 0, &hf_x509ce_OnlyCertificateTypes_userPublicKey, -1, -1, "userPublicKey", NULL },
{ 1, &hf_x509ce_OnlyCertificateTypes_cA, -1, -1, "cA", NULL },
@ -1005,8 +1022,8 @@ static const asn_namedbit OnlyCertificateTypes_bits[] = {
int
dissect_x509ce_OnlyCertificateTypes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
OnlyCertificateTypes_bits, hf_index, ett_x509ce_OnlyCertificateTypes,
NULL);
OnlyCertificateTypes_bits, hf_index, ett_x509ce_OnlyCertificateTypes,
NULL);
return offset;
}
@ -1014,6 +1031,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 const asn_namedbit ReasonFlags_bits[] = {
{ 0, &hf_x509ce_ReasonFlags_unused, -1, -1, "unused", NULL },
{ 1, &hf_x509ce_ReasonFlags_keyCompromise, -1, -1, "keyCompromise", NULL },
@ -1030,8 +1048,8 @@ static const asn_namedbit ReasonFlags_bits[] = {
int
dissect_x509ce_ReasonFlags(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
ReasonFlags_bits, hf_index, ett_x509ce_ReasonFlags,
NULL);
ReasonFlags_bits, hf_index, ett_x509ce_ReasonFlags,
NULL);
return offset;
}
@ -1045,6 +1063,7 @@ static int dissect_reasonFlags(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509ce_ReasonFlags(FALSE, tvb, offset, pinfo, tree, hf_x509ce_reasonFlags);
}
static const ber_sequence_t 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 },
@ -1055,7 +1074,7 @@ static const ber_sequence_t NumberRange_sequence[] = {
int
dissect_x509ce_NumberRange(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
NumberRange_sequence, hf_index, ett_x509ce_NumberRange);
NumberRange_sequence, hf_index, ett_x509ce_NumberRange);
return offset;
}
@ -1079,6 +1098,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 const ber_sequence_t 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 },
@ -1089,7 +1109,7 @@ static const ber_sequence_t BaseRevocationInfo_sequence[] = {
int
dissect_x509ce_BaseRevocationInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
BaseRevocationInfo_sequence, hf_index, ett_x509ce_BaseRevocationInfo);
BaseRevocationInfo_sequence, hf_index, ett_x509ce_BaseRevocationInfo);
return offset;
}
@ -1097,6 +1117,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 const ber_sequence_t 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 },
@ -1112,7 +1133,7 @@ static const ber_sequence_t PerAuthorityScope_sequence[] = {
int
dissect_x509ce_PerAuthorityScope(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PerAuthorityScope_sequence, hf_index, ett_x509ce_PerAuthorityScope);
PerAuthorityScope_sequence, hf_index, ett_x509ce_PerAuthorityScope);
return offset;
}
@ -1136,8 +1157,9 @@ 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 const ber_sequence_t DeltaRefInfo_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation },
{ BER_CLASS_ANY/*choice*/, -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 }
};
@ -1145,7 +1167,7 @@ static const ber_sequence_t DeltaRefInfo_sequence[] = {
int
dissect_x509ce_DeltaRefInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DeltaRefInfo_sequence, hf_index, ett_x509ce_DeltaRefInfo);
DeltaRefInfo_sequence, hf_index, ett_x509ce_DeltaRefInfo);
return offset;
}
@ -1153,6 +1175,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 const ber_sequence_t CRLReferral_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_crlr_issuer_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG|BER_FLAGS_NOTCHKTAG, dissect_location_impl },
@ -1166,7 +1189,7 @@ static const ber_sequence_t CRLReferral_sequence[] = {
int
dissect_x509ce_CRLReferral(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CRLReferral_sequence, hf_index, ett_x509ce_CRLReferral);
CRLReferral_sequence, hf_index, ett_x509ce_CRLReferral);
return offset;
}
@ -1188,7 +1211,8 @@ static const ber_choice_t StatusReferral_choice[] = {
int
dissect_x509ce_StatusReferral(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
StatusReferral_choice, hf_index, ett_x509ce_StatusReferral, NULL);
StatusReferral_choice, hf_index, ett_x509ce_StatusReferral,
NULL);
return offset;
}
@ -1198,7 +1222,7 @@ static int dissect_StatusReferrals_item(packet_info *pinfo, proto_tree *tree, tv
static const ber_sequence_t StatusReferrals_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_StatusReferrals_item },
};
int
@ -1225,8 +1249,9 @@ dissect_x509ce_OrderedListSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
return offset;
}
static const ber_sequence_t DeltaInformation_sequence[] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_deltaLocation },
{ BER_CLASS_ANY/*choice*/, -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 }
};
@ -1234,11 +1259,12 @@ static const ber_sequence_t DeltaInformation_sequence[] = {
int
dissect_x509ce_DeltaInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DeltaInformation_sequence, hf_index, ett_x509ce_DeltaInformation);
DeltaInformation_sequence, hf_index, ett_x509ce_DeltaInformation);
return offset;
}
static const ber_sequence_t 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 },
@ -1249,7 +1275,7 @@ static const ber_sequence_t DistributionPoint_sequence[] = {
int
dissect_x509ce_DistributionPoint(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DistributionPoint_sequence, hf_index, ett_x509ce_DistributionPoint);
DistributionPoint_sequence, hf_index, ett_x509ce_DistributionPoint);
return offset;
}
@ -1270,6 +1296,7 @@ dissect_x509ce_CRLDistPointsSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int
return offset;
}
static const ber_sequence_t 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 },
@ -1285,12 +1312,13 @@ static const ber_sequence_t IssuingDistPointSyntax_sequence[] = {
int
dissect_x509ce_IssuingDistPointSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
IssuingDistPointSyntax_sequence, hf_index, ett_x509ce_IssuingDistPointSyntax);
IssuingDistPointSyntax_sequence, hf_index, ett_x509ce_IssuingDistPointSyntax);
return offset;
}
int
dissect_x509ce_BaseCRLNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509ce_CRLNumber(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -1298,6 +1326,7 @@ dissect_x509ce_BaseCRLNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
return offset;
}
static const ber_sequence_t CertificateExactAssertion_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_serialNumber },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
@ -1307,7 +1336,7 @@ static const ber_sequence_t CertificateExactAssertion_sequence[] = {
int
dissect_x509ce_CertificateExactAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertificateExactAssertion_sequence, hf_index, ett_x509ce_CertificateExactAssertion);
CertificateExactAssertion_sequence, hf_index, ett_x509ce_CertificateExactAssertion);
return offset;
}
@ -1359,7 +1388,8 @@ static const ber_choice_t AltNameType_choice[] = {
int
dissect_x509ce_AltNameType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
AltNameType_choice, hf_index, ett_x509ce_AltNameType, NULL);
AltNameType_choice, hf_index, ett_x509ce_AltNameType,
NULL);
return offset;
}
@ -1383,6 +1413,7 @@ static int dissect_policy_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509ce_CertPolicySet(TRUE, tvb, offset, pinfo, tree, hf_x509ce_policy);
}
static const ber_sequence_t CertificateAssertion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_serialNumber_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuer_impl },
@ -1402,7 +1433,7 @@ static const ber_sequence_t CertificateAssertion_sequence[] = {
int
dissect_x509ce_CertificateAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertificateAssertion_sequence, hf_index, ett_x509ce_CertificateAssertion);
CertificateAssertion_sequence, hf_index, ett_x509ce_CertificateAssertion);
return offset;
}
@ -1413,6 +1444,7 @@ static int dissect_issuedByThisCAAssertion_impl(packet_info *pinfo, proto_tree *
return dissect_x509ce_CertificateAssertion(TRUE, tvb, offset, pinfo, tree, hf_x509ce_issuedByThisCAAssertion);
}
static const ber_sequence_t CertificatePairExactAssertion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cpea_issuedToThisCAAssertion_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_cpea_issuedByThisCAAssertion_impl },
@ -1422,11 +1454,12 @@ static const ber_sequence_t CertificatePairExactAssertion_sequence[] = {
int
dissect_x509ce_CertificatePairExactAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertificatePairExactAssertion_sequence, hf_index, ett_x509ce_CertificatePairExactAssertion);
CertificatePairExactAssertion_sequence, hf_index, ett_x509ce_CertificatePairExactAssertion);
return offset;
}
static const ber_sequence_t CertificatePairAssertion_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedToThisCAAssertion_impl },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_issuedByThisCAAssertion_impl },
@ -1436,25 +1469,27 @@ static const ber_sequence_t CertificatePairAssertion_sequence[] = {
int
dissect_x509ce_CertificatePairAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertificatePairAssertion_sequence, hf_index, ett_x509ce_CertificatePairAssertion);
CertificatePairAssertion_sequence, hf_index, ett_x509ce_CertificatePairAssertion);
return offset;
}
static const ber_sequence_t CertificateListExactAssertion_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_distributionPoint },
{ 0, 0, 0, NULL }
};
int
dissect_x509ce_CertificateListExactAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertificateListExactAssertion_sequence, hf_index, ett_x509ce_CertificateListExactAssertion);
CertificateListExactAssertion_sequence, hf_index, ett_x509ce_CertificateListExactAssertion);
return offset;
}
static const ber_sequence_t CertificateListAssertion_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_issuer },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_minCRLNumber_impl },
@ -1468,11 +1503,12 @@ static const ber_sequence_t CertificateListAssertion_sequence[] = {
int
dissect_x509ce_CertificateListAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
CertificateListAssertion_sequence, hf_index, ett_x509ce_CertificateListAssertion);
CertificateListAssertion_sequence, hf_index, ett_x509ce_CertificateListAssertion);
return offset;
}
static const ber_sequence_t PkiPathMatchSyntax_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_firstIssuer },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_lastSubject },
@ -1482,7 +1518,7 @@ static const ber_sequence_t PkiPathMatchSyntax_sequence[] = {
int
dissect_x509ce_PkiPathMatchSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PkiPathMatchSyntax_sequence, hf_index, ett_x509ce_PkiPathMatchSyntax);
PkiPathMatchSyntax_sequence, hf_index, ett_x509ce_PkiPathMatchSyntax);
return offset;
}

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

@ -41,9 +41,9 @@
#include <stdio.h>
#include <string.h>
#include "packet-x509if.h"
#include "packet-ber.h"
#include "packet-x509sat.h"
#include "packet-x509if.h"
#define PNAME "X.509 Information Framework"
#define PSNAME "X509IF"
@ -463,6 +463,7 @@ static int dissect_includeSubtypes(packet_info *pinfo, proto_tree *tree, tvbuff_
return dissect_x509if_BOOLEAN(FALSE, tvb, offset, pinfo, tree, hf_x509if_includeSubtypes);
}
static const ber_sequence_t Context_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextValues },
@ -473,7 +474,7 @@ static const ber_sequence_t Context_sequence[] = {
int
dissect_x509if_Context(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Context_sequence, hf_index, ett_x509if_Context);
Context_sequence, hf_index, ett_x509if_Context);
return offset;
}
@ -497,6 +498,7 @@ static int dissect_contextList(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509if_SET_OF_Context(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextList);
}
static const ber_sequence_t T_valuesWithContext_item_sequence[] = {
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_value },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList },
@ -506,7 +508,7 @@ static const ber_sequence_t T_valuesWithContext_item_sequence[] = {
static int
dissect_x509if_T_valuesWithContext_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
T_valuesWithContext_item_sequence, hf_index, ett_x509if_T_valuesWithContext_item);
T_valuesWithContext_item_sequence, hf_index, ett_x509if_T_valuesWithContext_item);
return offset;
}
@ -530,6 +532,7 @@ static int dissect_valuesWithContext(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509if_T_valuesWithContext(FALSE, tvb, offset, pinfo, tree, hf_x509if_valuesWithContext);
}
static const ber_sequence_t Attribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_values },
@ -540,12 +543,13 @@ static const ber_sequence_t Attribute_sequence[] = {
int
dissect_x509if_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Attribute_sequence, hf_index, ett_x509if_Attribute);
Attribute_sequence, hf_index, ett_x509if_Attribute);
return offset;
}
int
dissect_x509if_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509if_AttributeId(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -617,6 +621,7 @@ static int dissect_ca_contextValues(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_SET_OF_ContextValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_ca_contextValues);
}
static const ber_sequence_t ContextAssertion_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_ca_contextType },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_ca_contextValues },
@ -626,7 +631,7 @@ static const ber_sequence_t ContextAssertion_sequence[] = {
int
dissect_x509if_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ContextAssertion_sequence, hf_index, ett_x509if_ContextAssertion);
ContextAssertion_sequence, hf_index, ett_x509if_ContextAssertion);
return offset;
}
@ -669,7 +674,8 @@ static const ber_choice_t T_assertedContexts_choice[] = {
static int
dissect_x509if_T_assertedContexts(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts, NULL);
T_assertedContexts_choice, hf_index, ett_x509if_T_assertedContexts,
NULL);
return offset;
}
@ -677,17 +683,18 @@ static int dissect_assertedContexts(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_T_assertedContexts(FALSE, tvb, offset, pinfo, tree, hf_x509if_assertedContexts);
}
static const ber_sequence_t AttributeValueAssertion_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_assertion },
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_assertedContexts },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_assertedContexts },
{ 0, 0, 0, NULL }
};
int
dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AttributeValueAssertion_sequence, hf_index, ett_x509if_AttributeValueAssertion);
AttributeValueAssertion_sequence, hf_index, ett_x509if_AttributeValueAssertion);
return offset;
}
@ -708,6 +715,7 @@ static int dissect_ata_assertedContexts(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509if_SEQUENCE_OF_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_ata_assertedContexts);
}
static const ber_sequence_t AttributeTypeAssertion_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_ata_assertedContexts },
@ -717,11 +725,12 @@ static const ber_sequence_t AttributeTypeAssertion_sequence[] = {
int
dissect_x509if_AttributeTypeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AttributeTypeAssertion_sequence, hf_index, ett_x509if_AttributeTypeAssertion);
AttributeTypeAssertion_sequence, hf_index, ett_x509if_AttributeTypeAssertion);
return offset;
}
static const ber_sequence_t T_valWithContext_item_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_distingAttrValue },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_contextList },
@ -731,7 +740,7 @@ static const ber_sequence_t T_valWithContext_item_sequence[] = {
static int
dissect_x509if_T_valWithContext_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
T_valWithContext_item_sequence, hf_index, ett_x509if_T_valWithContext_item);
T_valWithContext_item_sequence, hf_index, ett_x509if_T_valWithContext_item);
return offset;
}
@ -755,6 +764,7 @@ static int dissect_valueswithContext(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509if_T_valWithContext(FALSE, tvb, offset, pinfo, tree, hf_x509if_valueswithContext);
}
static const ber_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_type },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_atadv_value },
@ -766,7 +776,7 @@ static const ber_sequence_t AttributeTypeAndDistinguishedValue_sequence[] = {
int
dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
AttributeTypeAndDistinguishedValue_sequence, hf_index, ett_x509if_AttributeTypeAndDistinguishedValue);
AttributeTypeAndDistinguishedValue_sequence, hf_index, ett_x509if_AttributeTypeAndDistinguishedValue);
return offset;
}
@ -820,12 +830,14 @@ static const ber_choice_t Name_choice[] = {
int
dissect_x509if_Name(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
Name_choice, hf_index, ett_x509if_Name, NULL);
Name_choice, hf_index, ett_x509if_Name,
NULL);
return offset;
}
int
dissect_x509if_DistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509if_RDNSequence(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -834,6 +846,7 @@ dissect_x509if_DistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
}
int
dissect_x509if_LocalName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_x509if_RDNSequence(implicit_tag, tvb, offset, pinfo, tree, hf_index);
@ -866,7 +879,8 @@ static const ber_choice_t T_specificExclusions_item_choice[] = {
static int
dissect_x509if_T_specificExclusions_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item, NULL);
T_specificExclusions_item_choice, hf_index, ett_x509if_T_specificExclusions_item,
NULL);
return offset;
}
@ -876,7 +890,7 @@ static int dissect_specificExclusions_item(packet_info *pinfo, proto_tree *tree,
static const ber_sequence_t T_specificExclusions_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_specificExclusions_item },
};
static int
@ -954,7 +968,7 @@ static int dissect_newMatchingRule(packet_info *pinfo, proto_tree *tree, tvbuff_
static const ber_sequence_t SET_OF_Refinement_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_refinement_and_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_refinement_and_item },
};
static int
@ -991,11 +1005,13 @@ static const ber_choice_t Refinement_choice[] = {
int
dissect_x509if_Refinement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
Refinement_choice, hf_index, ett_x509if_Refinement, NULL);
Refinement_choice, hf_index, ett_x509if_Refinement,
NULL);
return offset;
}
static const ber_sequence_t SubtreeSpecification_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_base },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_specificExclusions },
@ -1008,7 +1024,7 @@ static const ber_sequence_t SubtreeSpecification_sequence[] = {
int
dissect_x509if_SubtreeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SubtreeSpecification_sequence, hf_index, ett_x509if_SubtreeSpecification);
SubtreeSpecification_sequence, hf_index, ett_x509if_SubtreeSpecification);
return offset;
}
@ -1029,7 +1045,8 @@ static const ber_choice_t T_chopSpecificExclusions_item_choice[] = {
static int
dissect_x509if_T_chopSpecificExclusions_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item, NULL);
T_chopSpecificExclusions_item_choice, hf_index, ett_x509if_T_chopSpecificExclusions_item,
NULL);
return offset;
}
@ -1039,7 +1056,7 @@ static int dissect_chopSpecificExclusions_item(packet_info *pinfo, proto_tree *t
static const ber_sequence_t T_chopSpecificExclusions_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_chopSpecificExclusions_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_chopSpecificExclusions_item },
};
static int
@ -1053,6 +1070,7 @@ static int dissect_chopSpecificExclusions(packet_info *pinfo, proto_tree *tree,
return dissect_x509if_T_chopSpecificExclusions(FALSE, tvb, offset, pinfo, tree, hf_x509if_chopSpecificExclusions);
}
static const ber_sequence_t ChopSpecification_sequence[] = {
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_chopSpecificExclusions },
{ BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL, dissect_minimum },
@ -1063,7 +1081,7 @@ static const ber_sequence_t ChopSpecification_sequence[] = {
int
dissect_x509if_ChopSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ChopSpecification_sequence, hf_index, ett_x509if_ChopSpecification);
ChopSpecification_sequence, hf_index, ett_x509if_ChopSpecification);
return offset;
}
@ -1135,6 +1153,7 @@ static int dissect_superiorStructureRules(packet_info *pinfo, proto_tree *tree,
return dissect_x509if_SET_OF_RuleIdentifier(FALSE, tvb, offset, pinfo, tree, hf_x509if_superiorStructureRules);
}
static const ber_sequence_t DITStructureRule_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_ruleIdentifier },
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_nameForm },
@ -1145,7 +1164,7 @@ static const ber_sequence_t DITStructureRule_sequence[] = {
int
dissect_x509if_DITStructureRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DITStructureRule_sequence, hf_index, ett_x509if_DITStructureRule);
DITStructureRule_sequence, hf_index, ett_x509if_DITStructureRule);
return offset;
}
@ -1188,6 +1207,7 @@ static int dissect_precluded(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_x509if_SET_SIZE_1_MAX_OF_AttributeId(FALSE, tvb, offset, pinfo, tree, hf_x509if_precluded);
}
static const ber_sequence_t DITContentRule_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_structuralObjectClass },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_auxiliaries },
@ -1200,7 +1220,7 @@ static const ber_sequence_t DITContentRule_sequence[] = {
int
dissect_x509if_DITContentRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DITContentRule_sequence, hf_index, ett_x509if_DITContentRule);
DITContentRule_sequence, hf_index, ett_x509if_DITContentRule);
return offset;
}
@ -1237,6 +1257,7 @@ static int dissect_optionalContexts(packet_info *pinfo, proto_tree *tree, tvbuff
return dissect_x509if_T_optionalContexts(FALSE, tvb, offset, pinfo, tree, hf_x509if_optionalContexts);
}
static const ber_sequence_t DITContextUse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatoryContexts },
@ -1247,7 +1268,7 @@ static const ber_sequence_t DITContextUse_sequence[] = {
int
dissect_x509if_DITContextUse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DITContextUse_sequence, hf_index, ett_x509if_DITContextUse);
DITContextUse_sequence, hf_index, ett_x509if_DITContextUse);
return offset;
}
@ -1355,6 +1376,7 @@ static int dissect_ra_values(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
return dissect_x509if_SEQUENCE_OF_DefaultValueValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_ra_values);
}
static const ber_sequence_t T_defaultValues_item_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_entryType },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_ra_values },
@ -1364,7 +1386,7 @@ static const ber_sequence_t T_defaultValues_item_sequence[] = {
static int
dissect_x509if_T_defaultValues_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
T_defaultValues_item_sequence, hf_index, ett_x509if_T_defaultValues_item);
T_defaultValues_item_sequence, hf_index, ett_x509if_T_defaultValues_item);
return offset;
}
@ -1407,6 +1429,7 @@ static int dissect_selectedValues(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509if_SEQUENCE_OF_AttributeValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_selectedValues);
}
static const ber_sequence_t ContextProfile_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_contextType },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_contextValue },
@ -1416,7 +1439,7 @@ static const ber_sequence_t ContextProfile_sequence[] = {
int
dissect_x509if_ContextProfile(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ContextProfile_sequence, hf_index, ett_x509if_ContextProfile);
ContextProfile_sequence, hf_index, ett_x509if_ContextProfile);
return offset;
}
@ -1442,7 +1465,7 @@ static int dissect_contexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
static const ber_sequence_t SEQUENCE_OF_ContextCombination_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_contextcombination_and_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_contextcombination_and_item },
};
static int
@ -1479,11 +1502,13 @@ static const ber_choice_t ContextCombination_choice[] = {
int
dissect_x509if_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
ContextCombination_choice, hf_index, ett_x509if_ContextCombination, NULL);
ContextCombination_choice, hf_index, ett_x509if_ContextCombination,
NULL);
return offset;
}
static const ber_sequence_t MatchingUse_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_restrictionType },
{ BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_restrictionValue },
@ -1493,7 +1518,7 @@ static const ber_sequence_t MatchingUse_sequence[] = {
int
dissect_x509if_MatchingUse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MatchingUse_sequence, hf_index, ett_x509if_MatchingUse);
MatchingUse_sequence, hf_index, ett_x509if_MatchingUse);
return offset;
}
@ -1517,6 +1542,7 @@ static int dissect_matchingUse(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509if_SEQUENCE_OF_MatchingUse(FALSE, tvb, offset, pinfo, tree, hf_x509if_matchingUse);
}
static const ber_sequence_t RequestAttribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_includeSubtypes },
@ -1531,7 +1557,7 @@ static const ber_sequence_t RequestAttribute_sequence[] = {
int
dissect_x509if_RequestAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RequestAttribute_sequence, hf_index, ett_x509if_RequestAttribute);
RequestAttribute_sequence, hf_index, ett_x509if_RequestAttribute);
return offset;
}
@ -1557,7 +1583,7 @@ static int dissect_inputAttributeTypes(packet_info *pinfo, proto_tree *tree, tvb
static const ber_sequence_t SEQUENCE_OF_AttributeCombination_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
};
static int
@ -1594,7 +1620,8 @@ static const ber_choice_t AttributeCombination_choice[] = {
int
dissect_x509if_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination, NULL);
AttributeCombination_choice, hf_index, ett_x509if_AttributeCombination,
NULL);
return offset;
}
@ -1615,7 +1642,8 @@ static const ber_choice_t T_outputValues_choice[] = {
static int
dissect_x509if_T_outputValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
T_outputValues_choice, hf_index, ett_x509if_T_outputValues, NULL);
T_outputValues_choice, hf_index, ett_x509if_T_outputValues,
NULL);
return offset;
}
@ -1623,9 +1651,10 @@ static int dissect_outputValues(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509if_T_outputValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputValues);
}
static const ber_sequence_t ResultAttribute_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_outputValues },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_outputValues },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_contexts },
{ 0, 0, 0, NULL }
};
@ -1633,7 +1662,7 @@ static const ber_sequence_t ResultAttribute_sequence[] = {
int
dissect_x509if_ResultAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ResultAttribute_sequence, hf_index, ett_x509if_ResultAttribute);
ResultAttribute_sequence, hf_index, ett_x509if_ResultAttribute);
return offset;
}
@ -1657,6 +1686,7 @@ static int dissect_outputAttributeTypes(packet_info *pinfo, proto_tree *tree, tv
return dissect_x509if_SEQUENCE_OF_ResultAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputAttributeTypes);
}
static const ber_sequence_t ControlOptions_sequence[] = {
{ 0, 0, 0, NULL }
};
@ -1664,7 +1694,7 @@ static const ber_sequence_t ControlOptions_sequence[] = {
int
dissect_x509if_ControlOptions(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ControlOptions_sequence, hf_index, ett_x509if_ControlOptions);
ControlOptions_sequence, hf_index, ett_x509if_ControlOptions);
return offset;
}
@ -1678,6 +1708,7 @@ static int dissect_searchRuleControls(packet_info *pinfo, proto_tree *tree, tvbu
return dissect_x509if_ControlOptions(FALSE, tvb, offset, pinfo, tree, hf_x509if_searchRuleControls);
}
static const ber_sequence_t Mapping_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mappingFunction },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_level },
@ -1687,7 +1718,7 @@ static const ber_sequence_t Mapping_sequence[] = {
int
dissect_x509if_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Mapping_sequence, hf_index, ett_x509if_Mapping);
Mapping_sequence, hf_index, ett_x509if_Mapping);
return offset;
}
@ -1711,6 +1742,7 @@ static int dissect_mapping(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509if_SEQUENCE_OF_Mapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_mapping);
}
static const ber_sequence_t MRSubstitution_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attribute },
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_oldMatchingRule },
@ -1721,7 +1753,7 @@ static const ber_sequence_t MRSubstitution_sequence[] = {
int
dissect_x509if_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MRSubstitution_sequence, hf_index, ett_x509if_MRSubstitution);
MRSubstitution_sequence, hf_index, ett_x509if_MRSubstitution);
return offset;
}
@ -1745,6 +1777,7 @@ static int dissect_substitution(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509if_SEQUENCE_OF_MRSubstitution(FALSE, tvb, offset, pinfo, tree, hf_x509if_substitution);
}
static const ber_sequence_t MRMapping_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_mapping },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_substitution },
@ -1754,7 +1787,7 @@ static const ber_sequence_t MRMapping_sequence[] = {
int
dissect_x509if_MRMapping(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MRMapping_sequence, hf_index, ett_x509if_MRMapping);
MRMapping_sequence, hf_index, ett_x509if_MRMapping);
return offset;
}
@ -1787,6 +1820,7 @@ static int dissect_relaxations(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
return dissect_x509if_SEQUENCE_OF_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxations);
}
static const ber_sequence_t RelaxationPolicy_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_basic },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_tightenings },
@ -1799,7 +1833,7 @@ static const ber_sequence_t RelaxationPolicy_sequence[] = {
int
dissect_x509if_RelaxationPolicy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
RelaxationPolicy_sequence, hf_index, ett_x509if_RelaxationPolicy);
RelaxationPolicy_sequence, hf_index, ett_x509if_RelaxationPolicy);
return offset;
}
@ -1823,6 +1857,7 @@ static int dissect_additionalControl(packet_info *pinfo, proto_tree *tree, tvbuf
return dissect_x509if_SEQUENCE_OF_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_x509if_additionalControl);
}
static const asn_namedbit AllowedSubset_bits[] = {
{ 0, &hf_x509if_AllowedSubset_baseObject, -1, -1, "baseObject", NULL },
{ 1, &hf_x509if_AllowedSubset_oneLevel, -1, -1, "oneLevel", NULL },
@ -1833,8 +1868,8 @@ static const asn_namedbit AllowedSubset_bits[] = {
int
dissect_x509if_AllowedSubset(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
AllowedSubset_bits, hf_index, ett_x509if_AllowedSubset,
NULL);
AllowedSubset_bits, hf_index, ett_x509if_AllowedSubset,
NULL);
return offset;
}
@ -1862,6 +1897,7 @@ static int dissect_imposedSubset(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509if_ImposedSubset(FALSE, tvb, offset, pinfo, tree, hf_x509if_imposedSubset);
}
static const ber_sequence_t EntryLimit_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_default },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_max },
@ -1871,7 +1907,7 @@ static const ber_sequence_t EntryLimit_sequence[] = {
int
dissect_x509if_EntryLimit(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
EntryLimit_sequence, hf_index, ett_x509if_EntryLimit);
EntryLimit_sequence, hf_index, ett_x509if_EntryLimit);
return offset;
}
@ -1895,6 +1931,7 @@ static int dissect_name(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
return dissect_x509if_SET_OF_DirectoryString(FALSE, tvb, offset, pinfo, tree, hf_x509if_name);
}
static const ber_sequence_t SearchRuleDescription_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id },
{ BER_CLASS_CON, 0, 0, dissect_dmdId },
@ -1920,11 +1957,12 @@ static const ber_sequence_t SearchRuleDescription_sequence[] = {
int
dissect_x509if_SearchRuleDescription(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SearchRuleDescription_sequence, hf_index, ett_x509if_SearchRuleDescription);
SearchRuleDescription_sequence, hf_index, ett_x509if_SearchRuleDescription);
return offset;
}
static const ber_sequence_t SearchRule_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id },
{ BER_CLASS_CON, 0, 0, dissect_dmdId },
@ -1947,11 +1985,12 @@ static const ber_sequence_t SearchRule_sequence[] = {
int
dissect_x509if_SearchRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SearchRule_sequence, hf_index, ett_x509if_SearchRule);
SearchRule_sequence, hf_index, ett_x509if_SearchRule);
return offset;
}
static const ber_sequence_t SearchRuleId_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_id },
{ BER_CLASS_CON, 0, 0, dissect_dmdId },
@ -1961,7 +2000,7 @@ static const ber_sequence_t SearchRuleId_sequence[] = {
int
dissect_x509if_SearchRuleId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
SearchRuleId_sequence, hf_index, ett_x509if_SearchRuleId);
SearchRuleId_sequence, hf_index, ett_x509if_SearchRuleId);
return offset;
}
@ -1982,7 +2021,8 @@ static const ber_choice_t OutputValues_choice[] = {
int
dissect_x509if_OutputValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
OutputValues_choice, hf_index, ett_x509if_OutputValues, NULL);
OutputValues_choice, hf_index, ett_x509if_OutputValues,
NULL);
return offset;
}

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

@ -290,6 +290,7 @@ static int dissect_ZonalSelect_item(packet_info *pinfo, proto_tree *tree, tvbuff
}
int
dissect_x509sat_DirectoryString(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);
@ -317,11 +318,12 @@ static int dissect_localeID2(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
}
int
dissect_x509sat_UniqueIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
NULL, hf_index, -1,
NULL);
NULL, hf_index, -1,
NULL);
return offset;
}
@ -330,11 +332,12 @@ static int dissect_uid(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
}
int
dissect_x509sat_CountryName(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, BER_UNI_TAG_PrintableString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -361,7 +364,8 @@ static const ber_choice_t CriteriaItem_choice[] = {
static int
dissect_x509sat_CriteriaItem(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem, NULL);
CriteriaItem_choice, hf_index, ett_x509sat_CriteriaItem,
NULL);
return offset;
}
@ -371,7 +375,7 @@ static int dissect_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
static const ber_sequence_t SET_OF_Criteria_set_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
};
static int
@ -408,7 +412,8 @@ static const ber_choice_t Criteria_choice[] = {
int
dissect_x509sat_Criteria(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
Criteria_choice, hf_index, ett_x509sat_Criteria, NULL);
Criteria_choice, hf_index, ett_x509sat_Criteria,
NULL);
return offset;
}
@ -455,6 +460,7 @@ static int dissect_subset(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_x509sat_T_subset(FALSE, tvb, offset, pinfo, tree, hf_x509sat_subset);
}
static const ber_sequence_t EnhancedGuide_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_objectClass },
{ BER_CLASS_CON, 1, BER_FLAGS_NOTCHKTAG, dissect_criteria },
@ -465,7 +471,7 @@ static const ber_sequence_t EnhancedGuide_sequence[] = {
int
dissect_x509sat_EnhancedGuide(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
EnhancedGuide_sequence, hf_index, ett_x509sat_EnhancedGuide);
EnhancedGuide_sequence, hf_index, ett_x509sat_EnhancedGuide);
return offset;
}
@ -484,11 +490,12 @@ dissect_x509sat_PostalAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
}
static int
dissect_x509sat_TelephoneNumber(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, BER_UNI_TAG_PrintableString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -497,11 +504,12 @@ static int dissect_telephoneNumber(packet_info *pinfo, proto_tree *tree, tvbuff_
}
static int
dissect_x509sat_PrintableString(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, BER_UNI_TAG_PrintableString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -515,6 +523,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 const ber_sequence_t 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 },
@ -525,11 +534,12 @@ static const ber_sequence_t TelexNumber_sequence[] = {
static int
dissect_x509sat_TelexNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
TelexNumber_sequence, hf_index, ett_x509sat_TelexNumber);
TelexNumber_sequence, hf_index, ett_x509sat_TelexNumber);
return offset;
}
static const ber_sequence_t FacsimileTelephoneNumber_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_PrintableString, BER_FLAGS_NOOWNTAG, dissect_telephoneNumber },
{ 0, 0, 0, NULL }
@ -538,37 +548,40 @@ static const ber_sequence_t FacsimileTelephoneNumber_sequence[] = {
int
dissect_x509sat_FacsimileTelephoneNumber(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
FacsimileTelephoneNumber_sequence, hf_index, ett_x509sat_FacsimileTelephoneNumber);
FacsimileTelephoneNumber_sequence, hf_index, ett_x509sat_FacsimileTelephoneNumber);
return offset;
}
int
dissect_x509sat_X121Address(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, BER_UNI_TAG_NumericString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
int
dissect_x509sat_InternationalISDNNumber(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, BER_UNI_TAG_NumericString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
int
dissect_x509sat_DestinationIndicator(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, BER_UNI_TAG_PrintableString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
@ -663,6 +676,7 @@ static int dissect_nAddresses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509sat_T_nAddresses(FALSE, tvb, offset, pinfo, tree, hf_x509sat_nAddresses);
}
static const ber_sequence_t PresentationAddress_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_pSelector },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_sSelector },
@ -674,7 +688,7 @@ static const ber_sequence_t PresentationAddress_sequence[] = {
int
dissect_x509sat_PresentationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
PresentationAddress_sequence, hf_index, ett_x509sat_PresentationAddress);
PresentationAddress_sequence, hf_index, ett_x509sat_PresentationAddress);
return offset;
}
@ -695,6 +709,7 @@ static int dissect_profiles(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509sat_T_profiles(FALSE, tvb, offset, pinfo, tree, hf_x509sat_profiles);
}
static const ber_sequence_t ProtocolInformation_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddress },
{ BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_profiles },
@ -704,11 +719,12 @@ static const ber_sequence_t ProtocolInformation_sequence[] = {
int
dissect_x509sat_ProtocolInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
ProtocolInformation_sequence, hf_index, ett_x509sat_ProtocolInformation);
ProtocolInformation_sequence, hf_index, ett_x509sat_ProtocolInformation);
return offset;
}
static const ber_sequence_t NameAndOptionalUID_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_dn },
{ BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_uid },
@ -718,7 +734,7 @@ static const ber_sequence_t NameAndOptionalUID_sequence[] = {
int
dissect_x509sat_NameAndOptionalUID(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
NameAndOptionalUID_sequence, hf_index, ett_x509sat_NameAndOptionalUID);
NameAndOptionalUID_sequence, hf_index, ett_x509sat_NameAndOptionalUID);
return offset;
}
@ -739,6 +755,7 @@ static int dissect_attributeList(packet_info *pinfo, proto_tree *tree, tvbuff_t
return dissect_x509sat_SEQUENCE_OF_AttributeValueAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509sat_attributeList);
}
static const ber_sequence_t MultipleMatchingLocalities_sequence[] = {
{ BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_matchingRuleUsed },
{ BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList },
@ -748,7 +765,7 @@ static const ber_sequence_t MultipleMatchingLocalities_sequence[] = {
int
dissect_x509sat_MultipleMatchingLocalities(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
MultipleMatchingLocalities_sequence, hf_index, ett_x509sat_MultipleMatchingLocalities);
MultipleMatchingLocalities_sequence, hf_index, ett_x509sat_MultipleMatchingLocalities);
return offset;
}
@ -773,7 +790,8 @@ static const ber_choice_t SubstringAssertion_item_choice[] = {
static int
dissect_x509sat_SubstringAssertion_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item, NULL);
SubstringAssertion_item_choice, hf_index, ett_x509sat_SubstringAssertion_item,
NULL);
return offset;
}
@ -783,7 +801,7 @@ static int dissect_SubstringAssertion_item(packet_info *pinfo, proto_tree *tree,
static const ber_sequence_t SubstringAssertion_sequence_of[1] = {
{ -1/*choice*/ , -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SubstringAssertion_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_SubstringAssertion_item },
};
int
@ -825,7 +843,8 @@ static const ber_choice_t OctetSubstringAssertion_item_choice[] = {
static int
dissect_x509sat_OctetSubstringAssertion_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item, NULL);
OctetSubstringAssertion_item_choice, hf_index, ett_x509sat_OctetSubstringAssertion_item,
NULL);
return offset;
}
@ -835,7 +854,7 @@ static int dissect_OctetSubstringAssertion_item(packet_info *pinfo, proto_tree *
static const ber_sequence_t OctetSubstringAssertion_sequence_of[1] = {
{ BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_OctetSubstringAssertion_item },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_OctetSubstringAssertion_item },
};
int
@ -877,16 +896,18 @@ dissect_x509sat_ZonalResult(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
}
int
dissect_x509sat_LanguageContextSyntax(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, BER_UNI_TAG_PrintableString,
pinfo, tree, tvb, offset, hf_index,
NULL);
pinfo, tree, tvb, offset, hf_index,
NULL);
return offset;
}
static int
dissect_x509sat_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_GeneralizedTime(implicit_tag, pinfo, tree, tvb, offset, hf_index);
@ -903,6 +924,7 @@ static int dissect_at(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
return dissect_x509sat_GeneralizedTime(FALSE, tvb, offset, pinfo, tree, hf_x509sat_at);
}
static const ber_sequence_t T_absolute_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startTime },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime },
@ -912,7 +934,7 @@ static const ber_sequence_t T_absolute_sequence[] = {
static int
dissect_x509sat_T_absolute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
T_absolute_sequence, hf_index, ett_x509sat_T_absolute);
T_absolute_sequence, hf_index, ett_x509sat_T_absolute);
return offset;
}
@ -951,6 +973,7 @@ static int dissect_second(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_x509sat_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_second);
}
static const ber_sequence_t DayTime_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_hour },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_minute },
@ -961,7 +984,7 @@ static const ber_sequence_t DayTime_sequence[] = {
int
dissect_x509sat_DayTime(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DayTime_sequence, hf_index, ett_x509sat_DayTime);
DayTime_sequence, hf_index, ett_x509sat_DayTime);
return offset;
}
@ -972,6 +995,7 @@ static int dissect_endDayTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
return dissect_x509sat_DayTime(FALSE, tvb, offset, pinfo, tree, hf_x509sat_endDayTime);
}
static const ber_sequence_t DayTimeBand_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_startDayTime },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endDayTime },
@ -981,7 +1005,7 @@ static const ber_sequence_t DayTimeBand_sequence[] = {
int
dissect_x509sat_DayTimeBand(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
DayTimeBand_sequence, hf_index, ett_x509sat_DayTimeBand);
DayTimeBand_sequence, hf_index, ett_x509sat_DayTimeBand);
return offset;
}
@ -1021,6 +1045,7 @@ static int dissect_intDay(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
return dissect_x509sat_T_intDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intDay);
}
static const asn_namedbit T_bitDay_bits[] = {
{ 0, &hf_x509sat_T_bitDay_sunday, -1, -1, "sunday", NULL },
{ 1, &hf_x509sat_T_bitDay_monday, -1, -1, "monday", NULL },
@ -1035,8 +1060,8 @@ static const asn_namedbit T_bitDay_bits[] = {
static int
dissect_x509sat_T_bitDay(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
T_bitDay_bits, hf_index, ett_x509sat_T_bitDay,
NULL);
T_bitDay_bits, hf_index, ett_x509sat_T_bitDay,
NULL);
return offset;
}
@ -1068,6 +1093,7 @@ static int dissect_intNamedDays(packet_info *pinfo, proto_tree *tree, tvbuff_t *
return dissect_x509sat_T_intNamedDays(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intNamedDays);
}
static const asn_namedbit T_bitNamedDays_bits[] = {
{ 0, &hf_x509sat_T_bitNamedDays_sunday, -1, -1, "sunday", NULL },
{ 1, &hf_x509sat_T_bitNamedDays_monday, -1, -1, "monday", NULL },
@ -1082,8 +1108,8 @@ static const asn_namedbit T_bitNamedDays_bits[] = {
static int
dissect_x509sat_T_bitNamedDays(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
T_bitNamedDays_bits, hf_index, ett_x509sat_T_bitNamedDays,
NULL);
T_bitNamedDays_bits, hf_index, ett_x509sat_T_bitNamedDays,
NULL);
return offset;
}
@ -1107,7 +1133,8 @@ static const ber_choice_t NamedDay_choice[] = {
int
dissect_x509sat_NamedDay(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
NamedDay_choice, hf_index, ett_x509sat_NamedDay, NULL);
NamedDay_choice, hf_index, ett_x509sat_NamedDay,
NULL);
return offset;
}
@ -1149,7 +1176,8 @@ static const ber_choice_t XDayOf_choice[] = {
int
dissect_x509sat_XDayOf(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
XDayOf_choice, hf_index, ett_x509sat_XDayOf, NULL);
XDayOf_choice, hf_index, ett_x509sat_XDayOf,
NULL);
return offset;
}
@ -1168,14 +1196,15 @@ static const value_string x509sat_T_days_vals[] = {
static const ber_choice_t T_days_choice[] = {
{ 0, BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_intDay },
{ 1, BER_CLASS_UNI, BER_UNI_TAG_BITSTRING, BER_FLAGS_NOOWNTAG, dissect_bitDay },
{ 2, BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_dayOf },
{ 2, BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG, dissect_dayOf },
{ 0, 0, 0, 0, NULL }
};
static int
dissect_x509sat_T_days(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
T_days_choice, hf_index, ett_x509sat_T_days, NULL);
T_days_choice, hf_index, ett_x509sat_T_days,
NULL);
return offset;
}
@ -1217,6 +1246,7 @@ static int dissect_intWeek(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509sat_T_intWeek(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intWeek);
}
static const asn_namedbit T_bitWeek_bits[] = {
{ 0, &hf_x509sat_T_bitWeek_week1, -1, -1, "week1", NULL },
{ 1, &hf_x509sat_T_bitWeek_week2, -1, -1, "week2", NULL },
@ -1229,8 +1259,8 @@ static const asn_namedbit T_bitWeek_bits[] = {
static int
dissect_x509sat_T_bitWeek(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
T_bitWeek_bits, hf_index, ett_x509sat_T_bitWeek,
NULL);
T_bitWeek_bits, hf_index, ett_x509sat_T_bitWeek,
NULL);
return offset;
}
@ -1256,7 +1286,8 @@ static const ber_choice_t T_weeks_choice[] = {
static int
dissect_x509sat_T_weeks(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
T_weeks_choice, hf_index, ett_x509sat_T_weeks, NULL);
T_weeks_choice, hf_index, ett_x509sat_T_weeks,
NULL);
return offset;
}
@ -1280,6 +1311,7 @@ static int dissect_intMonth(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509sat_T_intMonth(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intMonth);
}
static const asn_namedbit T_bitMonth_bits[] = {
{ 0, &hf_x509sat_T_bitMonth_january, -1, -1, "january", NULL },
{ 1, &hf_x509sat_T_bitMonth_february, -1, -1, "february", NULL },
@ -1299,8 +1331,8 @@ static const asn_namedbit T_bitMonth_bits[] = {
static int
dissect_x509sat_T_bitMonth(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_bitstring(implicit_tag, pinfo, tree, tvb, offset,
T_bitMonth_bits, hf_index, ett_x509sat_T_bitMonth,
NULL);
T_bitMonth_bits, hf_index, ett_x509sat_T_bitMonth,
NULL);
return offset;
}
@ -1326,7 +1358,8 @@ static const ber_choice_t T_months_choice[] = {
static int
dissect_x509sat_T_months(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
T_months_choice, hf_index, ett_x509sat_T_months, NULL);
T_months_choice, hf_index, ett_x509sat_T_months,
NULL);
return offset;
}
@ -1350,6 +1383,7 @@ static int dissect_years(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
return dissect_x509sat_T_years(FALSE, tvb, offset, pinfo, tree, hf_x509sat_years);
}
static const ber_sequence_t Period_sequence[] = {
{ BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_timesOfDay },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_days },
@ -1362,7 +1396,7 @@ static const ber_sequence_t Period_sequence[] = {
int
dissect_x509sat_Period(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
Period_sequence, hf_index, ett_x509sat_Period);
Period_sequence, hf_index, ett_x509sat_Period);
return offset;
}
@ -1402,7 +1436,8 @@ static const ber_choice_t T_time_choice[] = {
static int
dissect_x509sat_T_time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
T_time_choice, hf_index, ett_x509sat_T_time, NULL);
T_time_choice, hf_index, ett_x509sat_T_time,
NULL);
return offset;
}
@ -1438,8 +1473,9 @@ static int dissect_timeZone(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
return dissect_x509sat_TimeZone(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timeZone);
}
static const ber_sequence_t TimeSpecification_sequence[] = {
{ BER_CLASS_UNI, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_time },
{ BER_CLASS_ANY/*choice*/, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_time },
{ BER_CLASS_UNI, BER_UNI_TAG_BOOLEAN, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_notThisTime },
{ BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_OPTIONAL|BER_FLAGS_NOOWNTAG, dissect_timeZone },
{ 0, 0, 0, NULL }
@ -1448,11 +1484,12 @@ static const ber_sequence_t TimeSpecification_sequence[] = {
int
dissect_x509sat_TimeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
TimeSpecification_sequence, hf_index, ett_x509sat_TimeSpecification);
TimeSpecification_sequence, hf_index, ett_x509sat_TimeSpecification);
return offset;
}
static const ber_sequence_t T_between_sequence[] = {
{ BER_CLASS_CON, 0, 0, dissect_startTime },
{ BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_endTime },
@ -1463,7 +1500,7 @@ static const ber_sequence_t T_between_sequence[] = {
static int
dissect_x509sat_T_between(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset,
T_between_sequence, hf_index, ett_x509sat_T_between);
T_between_sequence, hf_index, ett_x509sat_T_between);
return offset;
}
@ -1489,7 +1526,8 @@ static const ber_choice_t TimeAssertion_choice[] = {
int
dissect_x509sat_TimeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion, NULL);
TimeAssertion_choice, hf_index, ett_x509sat_TimeAssertion,
NULL);
return offset;
}
@ -1510,7 +1548,8 @@ static const ber_choice_t LocaleContextSyntax_choice[] = {
int
dissect_x509sat_LocaleContextSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
offset = dissect_ber_choice(pinfo, tree, tvb, offset,
LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax, NULL);
LocaleContextSyntax_choice, hf_index, ett_x509sat_LocaleContextSyntax,
NULL);
return offset;
}
@ -1673,7 +1712,7 @@ void proto_register_x509sat(void) {
"ProtocolInformation/profiles/_item", HFILL }},
{ &hf_x509sat_dn,
{ "dn", "x509sat.dn",
FT_NONE, BASE_NONE, NULL, 0,
FT_UINT32, BASE_DEC, NULL, 0,
"NameAndOptionalUID/dn", HFILL }},
{ &hf_x509sat_uid,
{ "uid", "x509sat.uid",