aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraeme Lunt <graeme.lunt@smhs.co.uk>2007-01-28 10:15:46 +0000
committerGraeme Lunt <graeme.lunt@smhs.co.uk>2007-01-28 10:15:46 +0000
commit7edc7aea68854c30fd42cc5576c1021fcb4c4480 (patch)
tree41fcd820906860d910b5d021549a39e8158b7cf9
parent428435dcd8649134c979f6e185eb665c8604a0ff (diff)
Definition of a per-recipient extension to prevent failure of dissection.
(Don't know what the extension actually is.) svn path=/trunk/; revision=20584
-rw-r--r--asn1/x509sat/x509sat.cnf3
-rw-r--r--epan/dissectors/packet-x509sat.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf
index d3a8b2c9ed..6256f24e2e 100644
--- a/asn1/x509sat/x509sat.cnf
+++ b/asn1/x509sat/x509sat.cnf
@@ -262,6 +262,9 @@ SyntaxPrintableString B "1.3.6.1.5.5.7.9.3" "pkcs-9-at-gender"
SyntaxPrintableString B "1.3.6.1.5.5.7.9.4" "pkcs-9-at-countryOfCitizenship"
SyntaxPrintableString B "1.3.6.1.5.5.7.9.5" "pkcs-9-at-countryOfResidence"
+# unknown X.420 PerRecipientExtensionField
+Integer B "1.2.826.0.1063.7.0.0.0" "unknown-UK-organisation-defined-extension"
+
#.NO_EMIT
#.TYPE_RENAME
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index 77d7748fd8..bbe985a789 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -2910,6 +2910,7 @@ void proto_reg_handoff_x509sat(void) {
register_ber_oid_dissector("1.3.6.1.5.5.7.9.3", dissect_SyntaxPrintableString_PDU, proto_x509sat, "pkcs-9-at-gender");
register_ber_oid_dissector("1.3.6.1.5.5.7.9.4", dissect_SyntaxPrintableString_PDU, proto_x509sat, "pkcs-9-at-countryOfCitizenship");
register_ber_oid_dissector("1.3.6.1.5.5.7.9.5", dissect_SyntaxPrintableString_PDU, proto_x509sat, "pkcs-9-at-countryOfResidence");
+ register_ber_oid_dissector("1.2.826.0.1063.7.0.0.0", dissect_Integer_PDU, proto_x509sat, "unknown-UK-organisation-defined-extension");
/*--- End of included file: packet-x509sat-dis-tab.c ---*/