aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2008-08-31 21:11:32 +0000
committerAnders Broman <anders.broman@ericsson.com>2008-08-31 21:11:32 +0000
commitc7b010d24666f855270ccf34eaf7847d069a9638 (patch)
treefce40d375a96ae2d2bc688efd4f1f564cb4e092a
parent47d612ccc9f0738bafd291d7bbc13c690928a397 (diff)
Remove test code for depreciated OID.
svn path=/trunk/; revision=26106
-rw-r--r--asn1/x509ce/x509ce.cnf1
-rw-r--r--epan/dissectors/packet-x509ce.c8
2 files changed, 4 insertions, 5 deletions
diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf
index b5680405c7..b2a1e884cc 100644
--- a/asn1/x509ce/x509ce.cnf
+++ b/asn1/x509ce/x509ce.cnf
@@ -92,7 +92,6 @@ StatusReferrals
SubjectKeyIdentifier
#.REGISTER
-PolicyInformationOld B "2.5.29.3" "id-ce-certificatePolicies(Depreciated)"
AttributesSyntax B "2.5.29.9" "id-ce-subjectDirectoryAttributes"
SubjectKeyIdentifier B "2.5.29.14" "id-ce-subjectKeyIdentifier"
KeyUsage B "2.5.29.15" "id-ce-keyUsage"
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 694cd7589e..8a5eac2ad4 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -336,7 +336,7 @@ dissect_x509ce_OtherNameType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
static int
dissect_x509ce_OtherNameValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 161 "x509ce.cnf"
+#line 160 "x509ce.cnf"
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);
@@ -393,7 +393,7 @@ dissect_x509ce_T_uniformResourceIdentifier(gboolean implicit_tag _U_, tvbuff_t *
actx, tree, tvb, offset, hf_index,
NULL);
-#line 164 "x509ce.cnf"
+#line 163 "x509ce.cnf"
PROTO_ITEM_SET_URL(actx->created_item);
@@ -405,7 +405,7 @@ dissect_x509ce_T_uniformResourceIdentifier(gboolean implicit_tag _U_, tvbuff_t *
static int
dissect_x509ce_T_iPAddress(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 154 "x509ce.cnf"
+#line 153 "x509ce.cnf"
proto_tree_add_item(tree, hf_x509ce_IPAddress, tvb, offset, 4, FALSE);
offset+=4;
@@ -588,7 +588,7 @@ dissect_x509ce_T_policyQualifierId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
static int
dissect_x509ce_T_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 151 "x509ce.cnf"
+#line 150 "x509ce.cnf"
offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree);