diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-28 12:52:13 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-28 12:52:13 +0000 |
| commit | c1ddd6046d8968e8df1aaea2e4cda78fcde87d21 (patch) | |
| tree | 08cb35fb8269f442eaccc170e6913633a8e07f8b /asn1/x509ce | |
| parent | 9009944d517462a907f8e650988425a45b4babd9 (diff) | |
| download | wireshark-c1ddd6046d8968e8df1aaea2e4cda78fcde87d21.tar.gz | |
replace object_identifier_id with actx->external.direct_reference
svn path=/trunk/; revision=50209
Diffstat (limited to 'asn1/x509ce')
| -rw-r--r-- | asn1/x509ce/packet-x509ce-template.c | 3 | ||||
| -rw-r--r-- | asn1/x509ce/x509ce.cnf | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/asn1/x509ce/packet-x509ce-template.c b/asn1/x509ce/packet-x509ce-template.c index a45427fef8..1d0f85570d 100644 --- a/asn1/x509ce/packet-x509ce-template.c +++ b/asn1/x509ce/packet-x509ce-template.c @@ -50,9 +50,6 @@ static int hf_x509ce_IPAddress = -1; /* Initialize the subtree pointers */ #include "packet-x509ce-ett.c" - -static const char *object_identifier_id; - #include "packet-x509ce-fn.c" /* CI+ (www.ci-plus.com) defines some X.509 certificate extensions diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf index 31ee0ae38e..d66748a0b1 100644 --- a/asn1/x509ce/x509ce.cnf +++ b/asn1/x509ce/x509ce.cnf @@ -165,20 +165,20 @@ CertificateAssertion/subjectAltName subjectAltNameType EnhancedCertificateAssertion/pathToName enhancedPathToName #.FN_PARS PolicyQualifierInfo/policyQualifierId - FN_VARIANT = _str HF_INDEX = hf_x509ce_object_identifier_id VAL_PTR = &object_identifier_id + FN_VARIANT = _str HF_INDEX = hf_x509ce_object_identifier_id VAL_PTR = &actx->external.direct_reference #.FN_BODY PolicyQualifierInfo/qualifier - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); + offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree); #.FN_BODY GeneralName/iPAddress proto_tree_add_item(tree, hf_x509ce_IPAddress, tvb, offset, 4, ENC_BIG_ENDIAN); offset+=4; #.FN_PARS OtherNameType - FN_VARIANT = _str VAL_PTR = &object_identifier_id + FN_VARIANT = _str VAL_PTR = &actx->external.direct_reference #.FN_BODY OtherNameValue - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); + offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree); #.FN_FTR GeneralName/uniformResourceIdentifier |