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

use the nice #.REGISTER directive instead of handcoding it in teh template 

svn path=/trunk/; revision=12394
This commit is contained in:
Ronnie Sahlberg 2004-10-26 13:54:09 +00:00
parent ec0752c135
commit 44bd159f06
2 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asn1/cms/cms.cnf
View File

@ -15,6 +15,13 @@ SignedData
Countersignature
IssuerAndSerialNumber
#.REGISTER
SignedData B "1.2.840.113549.1.7.2" "id-signedData"
EnvelopedData B "1.2.840.113549.1.7.3" "id-envelopedData"
DigestedData B "1.2.840.113549.1.7.5" "id-digestedData"
EncryptedData B "1.2.840.113549.1.7.6" "id-encryptedData"
AuthenticatedData B "1.2.840.113549.1.9.16.1.2" "id-ct-authenticatedData"
#.NO_EMIT
OtherKeyAttribute

37
asn1/cms/packet-cms-template.c
View File

@ -89,37 +89,6 @@ dissect_cms_OtherKeyAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
return offset;
}
static void
dissect_cms_SignedData_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
dissect_cms_SignedData(FALSE, tvb, 0, pinfo, tree, -1);
}
static void
dissect_cms_EnvelopedData_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
dissect_cms_EnvelopedData(FALSE, tvb, 0, pinfo, tree, -1);
}
static void
dissect_cms_DigestedData_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
dissect_cms_DigestedData(FALSE, tvb, 0, pinfo, tree, -1);
}
static void
dissect_cms_EncryptedData_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
dissect_cms_EncryptedData(FALSE, tvb, 0, pinfo, tree, -1);
}
static void
dissect_cms_AuthenticatedData_callback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
dissect_cms_AuthenticatedData(FALSE, tvb, 0, pinfo, tree, -1);
}
/* ContentInfo can not yet be handled by the compiler */
@ -188,10 +157,6 @@ void proto_register_cms(void) {
/*--- proto_reg_handoff_cms -------------------------------------------*/
void proto_reg_handoff_cms(void) {
register_ber_oid_dissector("1.2.840.113549.1.7.2", dissect_cms_SignedData_callback, proto_cms, "id-signedData");
register_ber_oid_dissector("1.2.840.113549.1.7.3", dissect_cms_EnvelopedData_callback, proto_cms, "id-envelopedData");
register_ber_oid_dissector("1.2.840.113549.1.7.5", dissect_cms_DigestedData_callback, proto_cms, "id-digestedData");
register_ber_oid_dissector("1.2.840.113549.1.7.6", dissect_cms_EncryptedData_callback, proto_cms, "id-encryptedData");
register_ber_oid_dissector("1.2.840.113549.1.9.16.1.2", dissect_cms_AuthenticatedData_callback, proto_cms, "id-ct-authenticatedData");
#include "packet-cms-dis-tab.c"
}