diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2023-09-10 17:00:53 +0000 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2023-09-10 17:00:53 +0000 |
| commit | 9243189bd53a072c31dcaffd33d1f56c1c1d9e6e (patch) | |
| tree | ec4eac76bf5709c2deddfcf8d13afa0b2d05bd06 /epan/dissectors/asn1/x509ce | |
| parent | 023592c4024531452e40c2014be195f8081899cd (diff) | |
x509ce: dissect CI+ security level extension
Diffstat (limited to 'epan/dissectors/asn1/x509ce')
| -rw-r--r-- | epan/dissectors/asn1/x509ce/CertificateExtensionsCiplus.asn | 10 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x509ce/packet-x509ce-template.c | 5 | ||||
| -rw-r--r-- | epan/dissectors/asn1/x509ce/x509ce.cnf | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/epan/dissectors/asn1/x509ce/CertificateExtensionsCiplus.asn b/epan/dissectors/asn1/x509ce/CertificateExtensionsCiplus.asn index 00c024b5d6..9f824c8e82 100644 --- a/epan/dissectors/asn1/x509ce/CertificateExtensionsCiplus.asn +++ b/epan/dissectors/asn1/x509ce/CertificateExtensionsCiplus.asn @@ -38,9 +38,19 @@ cicamBrandId EXTENSION ::= { CicamBrandId ::= INTEGER(1..65535) + +securityLevel EXTENSION ::= { + SYNTAX SecurityLevel + IDENTIFIED BY id-pe-securityLevel +} + +SecurityLevel ::= INTEGER (0..MAX) + + -- Object identifier assignments id-pe-scramblerCapabilities OBJECT IDENTIFIER ::= { id-pkix id-pe(1) 25 } id-pe-ciplusInfo OBJECT IDENTIFIER ::= { id-pkix id-pe(1) 26 } id-pe-cicamBrandId OBJECT IDENTIFIER ::= { id-pkix id-pe(1) 27 } +id-pe-securityLevel OBJECT IDENTIFIER ::= { id-pkix id-pe(1) 50 } END diff --git a/epan/dissectors/asn1/x509ce/packet-x509ce-template.c b/epan/dissectors/asn1/x509ce/packet-x509ce-template.c index 7c6e8cd1cc..e722e66b15 100644 --- a/epan/dissectors/asn1/x509ce/packet-x509ce-template.c +++ b/epan/dissectors/asn1/x509ce/packet-x509ce-template.c @@ -49,7 +49,7 @@ static int hf_x509ce_IPAddress_ipv6 = -1; void x509ce_enable_ciplus(void) { - dissector_handle_t dh25, dh26, dh27; + dissector_handle_t dh25, dh26, dh27, dh50; dh25 = create_dissector_handle(dissect_ScramblerCapabilities_PDU, proto_x509ce); dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.25", dh25); @@ -57,6 +57,8 @@ x509ce_enable_ciplus(void) dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.26", dh26); dh27 = create_dissector_handle(dissect_CicamBrandId_PDU, proto_x509ce); dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.27", dh27); + dh50 = create_dissector_handle(dissect_SecurityLevel_PDU, proto_x509ce); + dissector_change_string("ber.oid", "1.3.6.1.5.5.7.1.50", dh50); } void @@ -65,6 +67,7 @@ x509ce_disable_ciplus(void) dissector_reset_string("ber.oid", "1.3.6.1.5.5.7.1.25"); dissector_reset_string("ber.oid", "1.3.6.1.5.5.7.1.26"); dissector_reset_string("ber.oid", "1.3.6.1.5.5.7.1.27"); + dissector_reset_string("ber.oid", "1.3.6.1.5.5.7.1.50"); } diff --git a/epan/dissectors/asn1/x509ce/x509ce.cnf b/epan/dissectors/asn1/x509ce/x509ce.cnf index c92be35c57..242d136d2a 100644 --- a/epan/dissectors/asn1/x509ce/x509ce.cnf +++ b/epan/dissectors/asn1/x509ce/x509ce.cnf @@ -88,11 +88,13 @@ SubjectKeyIdentifier ScramblerCapabilities CiplusInfo CicamBrandId +SecurityLevel #.PDU ScramblerCapabilities CiplusInfo CicamBrandId +SecurityLevel #.REGISTER |