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

[x509af] Make CertificateSerialNumber an unsigned integer to handle a 9 

byte 64 bit BER encoded unsigned number.

Change-Id: I43e4a7f3103fac458a528022e0fdf6f0947804dc
Reviewed-on: https://code.wireshark.org/review/22585
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
AndersBroman 2017-07-11 14:26:52 +02:00 committed by Anders Broman
parent 0ba78c947b
commit 49e920bc21
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/x509af/x509af.cnf
View File

@ -152,7 +152,7 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate
proto_item_append_text(proto_item_get_parent(tree), " (%%s)", str?str:"");
#.TYPE_ATTR
CertificateSerialNumber TYPE = FT_INT64
CertificateSerialNumber TYPE = FT_UINT64
DSS-Params/p TYPE = FT_BYTES DISPLAY = BASE_NONE
DSS-Params/q TYPE = FT_BYTES DISPLAY = BASE_NONE
DSS-Params/g TYPE = FT_BYTES DISPLAY = BASE_NONE

5
epan/dissectors/asn1/x509ce/x509ce.cnf
View File

@ -13,7 +13,7 @@
#.END
# InformationFramework classes
##.CLASS ATTRIBUTE
# #.CLASS ATTRIBUTE
#&derivation ClassReference ATTRIBUTE
#&Type
#&equality-match ClassReference MATCHING-RULE
@ -24,7 +24,7 @@
#&no-user-modification BooleanType
#&usage
#&id ObjectIdentifierType
##.END
# #.END
#.CLASS MATCHING-RULE
&ParentMatchingRules ClassReference MATCHING-RULE
@ -184,4 +184,3 @@ EnhancedCertificateAssertion/pathToName enhancedPathToName
#.END

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

@ -1031,7 +1031,7 @@ void proto_register_x509af(void) {
NULL, HFILL }},
{ &hf_x509af_serialNumber,
{ "serialNumber", "x509af.serialNumber",
FT_INT64, BASE_DEC, NULL, 0,
FT_UINT64, BASE_DEC, NULL, 0,
"CertificateSerialNumber", HFILL }},
{ &hf_x509af_signature,
{ "signature", "x509af.signature_element",
@ -1179,7 +1179,7 @@ void proto_register_x509af(void) {
NULL, HFILL }},
{ &hf_x509af_revokedUserCertificate,
{ "userCertificate", "x509af.userCertificate",
FT_INT64, BASE_DEC, NULL, 0,
FT_UINT64, BASE_DEC, NULL, 0,
"CertificateSerialNumber", HFILL }},
{ &hf_x509af_revocationDate,
{ "revocationDate", "x509af.revocationDate",
@ -1247,7 +1247,7 @@ void proto_register_x509af(void) {
"UniqueIdentifier", HFILL }},
{ &hf_x509af_serial,
{ "serial", "x509af.serial",
FT_INT64, BASE_DEC, NULL, 0,
FT_UINT64, BASE_DEC, NULL, 0,
"CertificateSerialNumber", HFILL }},
{ &hf_x509af_issuerUID,
{ "issuerUID", "x509af.issuerUID",

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

@ -2184,7 +2184,7 @@ void proto_register_x509ce(void) {
"GeneralNames", HFILL }},
{ &hf_x509ce_authorityCertSerialNumber,
{ "authorityCertSerialNumber", "x509ce.authorityCertSerialNumber",
FT_INT64, BASE_DEC, NULL, 0,
FT_UINT64, BASE_DEC, NULL, 0,
"CertificateSerialNumber", HFILL }},
{ &hf_x509ce_KeyPurposeIDs_item,
{ "KeyPurposeId", "x509ce.KeyPurposeId",
@ -2512,7 +2512,7 @@ void proto_register_x509ce(void) {
"GeneralName", HFILL }},
{ &hf_x509ce_CertificateSerialNumbers_item,
{ "CertificateSerialNumber", "x509ce.CertificateSerialNumber",
FT_INT64, BASE_DEC, NULL, 0,
FT_UINT64, BASE_DEC, NULL, 0,
NULL, HFILL }},
{ &hf_x509ce_RevokedGroupsSyntax_item,
{ "RevokedGroup", "x509ce.RevokedGroup_element",
@ -2540,7 +2540,7 @@ void proto_register_x509ce(void) {
"BOOLEAN", HFILL }},
{ &hf_x509ce_serialNumber,
{ "serialNumber", "x509ce.serialNumber",
FT_INT64, BASE_DEC, NULL, 0,
FT_UINT64, BASE_DEC, NULL, 0,
"CertificateSerialNumber", HFILL }},
{ &hf_x509ce_issuer,
{ "issuer", "x509ce.issuer",