aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Peylo <wireshark@izac.de>2018-10-02 17:08:38 +0300
committerAnders Broman <a.broman58@gmail.com>2018-10-03 03:50:02 +0000
commit925f8119d7d4f42cf5f035dd308e4a168e92dd23 (patch)
tree6734ed59b12463353f7590f5920a4f04990a33e6
parent0bc74bb7ea51a49ef1d49cb69be94bf98fc53ae4 (diff)
Adding string for "anyPolicy" OID to x509ce
Commonly used in the certificate policies extension of X.509 CA certificates. Standardized in X.509 (and RFC 5280), existing in CertificateExtensions.asn Change-Id: I788127e7ccea7a31f9f3419aa425e607e772b97b Reviewed-on: https://code.wireshark.org/review/29981 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/asn1/x509ce/packet-x509ce-template.c2
-rw-r--r--epan/dissectors/packet-x509ce.c14
2 files changed, 10 insertions, 6 deletions
diff --git a/epan/dissectors/asn1/x509ce/packet-x509ce-template.c b/epan/dissectors/asn1/x509ce/packet-x509ce-template.c
index bd3283f0d0..f0c1b02dae 100644
--- a/epan/dissectors/asn1/x509ce/packet-x509ce-template.c
+++ b/epan/dissectors/asn1/x509ce/packet-x509ce-template.c
@@ -13,6 +13,7 @@
#include <epan/packet.h>
#include <epan/asn1.h>
+#include <epan/oids.h>
#include "packet-ber.h"
#include "packet-x509ce.h"
@@ -130,6 +131,7 @@ void proto_reg_handoff_x509ce(void) {
#include "packet-x509ce-dis-tab.c"
register_ber_oid_dissector("2.5.29.24", dissect_x509ce_invalidityDate_callback, proto_x509ce, "id-ce-invalidityDate");
register_ber_oid_dissector("2.5.29.51", dissect_x509ce_baseUpdateTime_callback, proto_x509ce, "id-ce-baseUpdateTime");
+ oid_add_from_string("anyPolicy","2.5.29.32.0");
}
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index aa3f0588e0..d49b16c7bd 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -21,6 +21,7 @@
#include <epan/packet.h>
#include <epan/asn1.h>
+#include <epan/oids.h>
#include "packet-ber.h"
#include "packet-x509ce.h"
@@ -245,7 +246,7 @@ static int hf_x509ce_EntrustInfoFlags_webCategory = -1;
static int hf_x509ce_EntrustInfoFlags_sETCategory = -1;
/*--- End of included file: packet-x509ce-hf.c ---*/
-#line 39 "./asn1/x509ce/packet-x509ce-template.c"
+#line 40 "./asn1/x509ce/packet-x509ce-template.c"
/* Initialize the subtree pointers */
@@ -313,7 +314,7 @@ static gint ett_x509ce_EntrustInfoFlags = -1;
static gint ett_x509ce_ScramblerCapabilities = -1;
/*--- End of included file: packet-x509ce-ett.c ---*/
-#line 42 "./asn1/x509ce/packet-x509ce-template.c"
+#line 43 "./asn1/x509ce/packet-x509ce-template.c"
/*--- Included file: packet-x509ce-fn.c ---*/
#line 1 "./asn1/x509ce/packet-x509ce-fn.c"
@@ -1943,7 +1944,7 @@ static int dissect_CicamBrandId_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
/*--- End of included file: packet-x509ce-fn.c ---*/
-#line 43 "./asn1/x509ce/packet-x509ce-template.c"
+#line 44 "./asn1/x509ce/packet-x509ce-template.c"
/* CI+ (www.ci-plus.com) defines some X.509 certificate extensions
that use OIDs which are not officially assigned
@@ -2800,7 +2801,7 @@ void proto_register_x509ce(void) {
NULL, HFILL }},
/*--- End of included file: packet-x509ce-hfarr.c ---*/
-#line 111 "./asn1/x509ce/packet-x509ce-template.c"
+#line 112 "./asn1/x509ce/packet-x509ce-template.c"
};
/* List of subtrees */
@@ -2870,7 +2871,7 @@ void proto_register_x509ce(void) {
&ett_x509ce_ScramblerCapabilities,
/*--- End of included file: packet-x509ce-ettarr.c ---*/
-#line 116 "./asn1/x509ce/packet-x509ce-template.c"
+#line 117 "./asn1/x509ce/packet-x509ce-template.c"
};
/* Register protocol */
@@ -2933,9 +2934,10 @@ void proto_reg_handoff_x509ce(void) {
/*--- End of included file: packet-x509ce-dis-tab.c ---*/
-#line 131 "./asn1/x509ce/packet-x509ce-template.c"
+#line 132 "./asn1/x509ce/packet-x509ce-template.c"
register_ber_oid_dissector("2.5.29.24", dissect_x509ce_invalidityDate_callback, proto_x509ce, "id-ce-invalidityDate");
register_ber_oid_dissector("2.5.29.51", dissect_x509ce_baseUpdateTime_callback, proto_x509ce, "id-ce-baseUpdateTime");
+ oid_add_from_string("anyPolicy","2.5.29.32.0");
}