diff options
| author | Uwe Heuert <uwe.heuert@exceeding-solutions.de> | 2022-12-15 17:30:38 +0100 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2023-01-03 07:44:19 +0000 |
| commit | 8429ed971f928e2261a5acfd960fd6193d78711b (patch) | |
| tree | dbaf3e0823ac3dc536e19dccb7ec30fb7307703d /epan/dissectors | |
| parent | eb05f77b71f9bdc3798afd39159003179eeb15d4 (diff) | |
prevent unused function
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/asn1/cms/cms.cnf | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-cms.c | 15 |
2 files changed, 19 insertions, 0 deletions
diff --git a/epan/dissectors/asn1/cms/cms.cnf b/epan/dissectors/asn1/cms/cms.cnf index e067c55add..77da31436b 100644 --- a/epan/dissectors/asn1/cms/cms.cnf +++ b/epan/dissectors/asn1/cms/cms.cnf @@ -68,6 +68,10 @@ GCMParameters B "2.16.840.1.101.3.4.1.6" "id-aes128-GCM" GCMParameters B "2.16.840.1.101.3.4.1.26" "id-aes192-GCM" GCMParameters B "2.16.840.1.101.3.4.1.46" "id-aes256-GCM" +CCMParameters B "2.16.840.1.101.3.4.1.7" "id-aes128-CCM" +CCMParameters B "2.16.840.1.101.3.4.1.27" "id-aes192-CCM" +CCMParameters B "2.16.840.1.101.3.4.1.44" "id-aes256-CCM" + # EC algorithms from RFC 3278 / RFC 5753 KeyWrapAlgorithm B "1.3.133.16.840.63.0.2" "dhSinglePass-stdDH-sha1kdf-scheme" KeyWrapAlgorithm B "1.3.132.1.11.0" "dhSinglePass-stdDH-sha224kdf-scheme" diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c index ec95eedc1a..16c2c4bce4 100644 --- a/epan/dissectors/packet-cms.c +++ b/epan/dissectors/packet-cms.c @@ -62,6 +62,7 @@ static int hf_cms_SMIMECapabilities_PDU = -1; /* SMIMECapabilities */ static int hf_cms_SMIMEEncryptionKeyPreference_PDU = -1; /* SMIMEEncryptionKeyPreference */ static int hf_cms_RC2CBCParameters_PDU = -1; /* RC2CBCParameters */ static int hf_cms_AuthEnvelopedData_PDU = -1; /* AuthEnvelopedData */ +static int hf_cms_CCMParameters_PDU = -1; /* CCMParameters */ static int hf_cms_GCMParameters_PDU = -1; /* GCMParameters */ static int hf_cms_FirmwarePkgData_PDU = -1; /* FirmwarePkgData */ static int hf_cms_FirmwarePackageIdentifier_PDU = -1; /* FirmwarePackageIdentifier */ @@ -2559,6 +2560,13 @@ static int dissect_AuthEnvelopedData_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _ offset = dissect_cms_AuthEnvelopedData(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_AuthEnvelopedData_PDU); return offset; } +static int dissect_CCMParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { + int offset = 0; + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + offset = dissect_cms_CCMParameters(FALSE, tvb, offset, &asn1_ctx, tree, hf_cms_CCMParameters_PDU); + return offset; +} static int dissect_GCMParameters_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) { int offset = 0; asn1_ctx_t asn1_ctx; @@ -2748,6 +2756,10 @@ void proto_register_cms(void) { { "AuthEnvelopedData", "cms.AuthEnvelopedData_element", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }}, + { &hf_cms_CCMParameters_PDU, + { "CCMParameters", "cms.CCMParameters_element", + FT_NONE, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_cms_GCMParameters_PDU, { "GCMParameters", "cms.GCMParameters_element", FT_NONE, BASE_NONE, NULL, 0, @@ -3534,6 +3546,9 @@ void proto_reg_handoff_cms(void) { register_ber_oid_dissector("2.16.840.1.101.3.4.1.6", dissect_GCMParameters_PDU, proto_cms, "id-aes128-GCM"); register_ber_oid_dissector("2.16.840.1.101.3.4.1.26", dissect_GCMParameters_PDU, proto_cms, "id-aes192-GCM"); register_ber_oid_dissector("2.16.840.1.101.3.4.1.46", dissect_GCMParameters_PDU, proto_cms, "id-aes256-GCM"); + register_ber_oid_dissector("2.16.840.1.101.3.4.1.7", dissect_CCMParameters_PDU, proto_cms, "id-aes128-CCM"); + register_ber_oid_dissector("2.16.840.1.101.3.4.1.27", dissect_CCMParameters_PDU, proto_cms, "id-aes192-CCM"); + register_ber_oid_dissector("2.16.840.1.101.3.4.1.44", dissect_CCMParameters_PDU, proto_cms, "id-aes256-CCM"); register_ber_oid_dissector("1.3.133.16.840.63.0.2", dissect_KeyWrapAlgorithm_PDU, proto_cms, "dhSinglePass-stdDH-sha1kdf-scheme"); register_ber_oid_dissector("1.3.132.1.11.0", dissect_KeyWrapAlgorithm_PDU, proto_cms, "dhSinglePass-stdDH-sha224kdf-scheme"); register_ber_oid_dissector("1.3.132.1.11.1", dissect_KeyWrapAlgorithm_PDU, proto_cms, "dhSinglePass-stdDH-sha256kdf-scheme"); |