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

add the oids for id-kp-xxx key purpose identifier to the pkix dissector 

svn path=/trunk/; revision=12549
This commit is contained in:
Ronnie Sahlberg 2004-11-20 21:26:08 +00:00
parent 649398d952
commit ed107b8938
4 changed files with 60 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
asn1/pkix1implicit/PKIX1IMPLICIT93.asn
View File

@ -108,6 +108,7 @@ IMPORTS
-- SYNTAX SEQUENCE SIZE (1..MAX) OF KeyPurposeId
-- IDENTIFIED BY id-ce-extKeyUsage }
--
Dummy ::= NULL
--KeyPurposeId ::= OBJECT IDENTIFIER
--
-- PKIX-defined extended key purpose OIDs

1
asn1/pkix1implicit/packet-pkix1implicit-template.c
View File

@ -76,5 +76,6 @@ void proto_register_pkix1implicit(void) {
/*--- proto_reg_handoff_pkix1implicit -------------------------------------------*/
void proto_reg_handoff_pkix1implicit(void) {
#include "packet-pkix1implicit-dis-tab.c"
}

11
asn1/pkix1implicit/pkix1implicit.cnf
View File

@ -11,6 +11,17 @@ UserNotice
#.PDU
#.REGISTER
Dummy B "1.3.6.1.5.5.7.3.1" "id-kp-serverAuth"
Dummy B "1.3.6.1.5.5.7.3.2" "id-kp-clientAuth"
Dummy B "1.3.6.1.5.5.7.3.3" "id-kp-codeSigning"
Dummy B "1.3.6.1.5.5.7.3.4" "id-kp-emailProtection"
Dummy B "1.3.6.1.5.5.7.3.5" "id-kp-ip-kp-ipsecEndSystem"
Dummy B "1.3.6.1.5.5.7.3.6" "id-kp-ipsecTunnel"
Dummy B "1.3.6.1.5.5.7.3.7" "id-kp-ipsecUser"
Dummy B "1.3.6.1.5.5.7.3.8" "id-kp-timeStamping"
Dummy B "1.3.6.1.5.5.7.3.9" "OCSPSigning"
#.NO_EMIT
#.TYPE_RENAME

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

@ -52,6 +52,7 @@ static int proto_pkix1implicit = -1;
/*--- Included file: packet-pkix1implicit-hf.c ---*/
static int hf_pkix1implicit_Dummy_PDU = -1; /* Dummy */
static int hf_pkix1implicit_noticeRef = -1; /* NoticeReference */
static int hf_pkix1implicit_explicitText = -1; /* DisplayText */
static int hf_pkix1implicit_organization = -1; /* DisplayText */
@ -85,7 +86,18 @@ static gint ett_pkix1implicit_DisplayText = -1;
static int
dissect_pkix1implicit_VisibleString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
dissect_pkix1implicit_Dummy(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
{ proto_item *ti_tmp;
ti_tmp = proto_tree_add_item(tree, hf_index, tvb, offset>>8, 0, FALSE);
proto_item_append_text(ti_tmp, ": NULL");
}
return offset;
}
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);
@ -98,7 +110,7 @@ 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) {
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);
@ -111,7 +123,7 @@ 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) {
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);
@ -138,7 +150,7 @@ static const ber_choice 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) {
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);
@ -154,8 +166,8 @@ static int dissect_organization(packet_info *pinfo, proto_tree *tree, tvbuff_t *
static int
dissect_pkix1implicit_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
offset = dissect_ber_integer(pinfo, tree, tvb, offset, hf_index, NULL);
dissect_pkix1implicit_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_new(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL);
return offset;
}
@ -168,7 +180,7 @@ static const ber_sequence SEQUNCE_OF_INTEGER_sequence_of[1] = {
};
static int
dissect_pkix1implicit_SEQUNCE_OF_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
dissect_pkix1implicit_SEQUNCE_OF_INTEGER(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,
SEQUNCE_OF_INTEGER_sequence_of, hf_index, ett_pkix1implicit_SEQUNCE_OF_INTEGER);
@ -185,7 +197,7 @@ static const ber_sequence 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) {
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);
@ -202,13 +214,19 @@ static const ber_sequence UserNotice_sequence[] = {
};
int
dissect_pkix1implicit_UserNotice(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index) {
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);
return offset;
}
/*--- PDUs ---*/
static void dissect_Dummy_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
dissect_pkix1implicit_Dummy(FALSE, tvb, 0, pinfo, tree, hf_pkix1implicit_Dummy_PDU);
}
/*--- End of included file: packet-pkix1implicit-fn.c ---*/
@ -222,6 +240,10 @@ void proto_register_pkix1implicit(void) {
/*--- Included file: packet-pkix1implicit-hfarr.c ---*/
{ &hf_pkix1implicit_Dummy_PDU,
{ "Dummy", "pkix1implicit.Dummy",
FT_NONE, BASE_NONE, NULL, 0,
"Dummy", HFILL }},
{ &hf_pkix1implicit_noticeRef,
{ "noticeRef", "pkix1implicit.noticeRef",
FT_NONE, BASE_NONE, NULL, 0,
@ -285,5 +307,21 @@ void proto_register_pkix1implicit(void) {
/*--- proto_reg_handoff_pkix1implicit -------------------------------------------*/
void proto_reg_handoff_pkix1implicit(void) {
/*--- Included file: packet-pkix1implicit-dis-tab.c ---*/
register_ber_oid_dissector("1.3.6.1.5.5.7.3.1", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-serverAuth");
register_ber_oid_dissector("1.3.6.1.5.5.7.3.2", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-clientAuth");
register_ber_oid_dissector("1.3.6.1.5.5.7.3.3", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-codeSigning");
register_ber_oid_dissector("1.3.6.1.5.5.7.3.4", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-emailProtection");
register_ber_oid_dissector("1.3.6.1.5.5.7.3.5", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-ip-kp-ipsecEndSystem");
register_ber_oid_dissector("1.3.6.1.5.5.7.3.6", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-ipsecTunnel");
register_ber_oid_dissector("1.3.6.1.5.5.7.3.7", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-ipsecUser");
register_ber_oid_dissector("1.3.6.1.5.5.7.3.8", dissect_Dummy_PDU, proto_pkix1implicit, "id-kp-timeStamping");
register_ber_oid_dissector("1.3.6.1.5.5.7.3.9", dissect_Dummy_PDU, proto_pkix1implicit, "OCSPSigning");
/*--- End of included file: packet-pkix1implicit-dis-tab.c ---*/
}