diff options
author | Anders Broman <anders.broman@ericsson.com> | 2008-07-23 12:45:24 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2008-07-23 12:45:24 +0000 |
commit | 201b5205df9bded623e3e67682b4cff99bcfb148 (patch) | |
tree | a4be54bc2b0830e54c2c9c442293c3cbcb6f9a28 | |
parent | d35d95395ae63e95744c808829bb5ae1e5a6dd56 (diff) |
Get rid of some unused code warnings and fix an Id marking and some indentation changes.
svn path=/trunk/; revision=25803
-rw-r--r-- | asn1/ldap/ldap.cnf | 4 | ||||
-rw-r--r-- | asn1/pkcs12/pkcs12.asn | 2 | ||||
-rw-r--r-- | asn1/pkix1implicit/pkix1implicit.cnf | 4 | ||||
-rw-r--r-- | asn1/pkixtsp/packet-pkixtsp-template.c | 2 | ||||
-rw-r--r-- | asn1/pkixtsp/pkixtsp.cnf | 3 | ||||
-rw-r--r-- | epan/dissectors/packet-pkix1implicit.c | 29 | ||||
-rw-r--r-- | epan/dissectors/packet-pkixtsp.c | 32 |
7 files changed, 38 insertions, 38 deletions
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index 801fd57951..8c095aa49f 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -31,8 +31,8 @@ AssertionValue TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL #.REGISTER SearchControlValue B "1.2.840.113556.1.4.319" "pagedResultsControl" -SortKeyList B "1.2.840.113556.1.4.473" "sortKeyList" -SortResult B "1.2.840.113556.1.4.474" "sortResult" +SortKeyList B "1.2.840.113556.1.4.473" "sortKeyList" +SortResult B "1.2.840.113556.1.4.474" "sortResult" ReplControlValue B "1.2.840.113556.1.4.841" "replControlValue" #RFC 3062 PasswdModifyRequestValue B "1.3.6.1.4.1.4203.1.11.1" "passwdModifyOID" diff --git a/asn1/pkcs12/pkcs12.asn b/asn1/pkcs12/pkcs12.asn index 0cde4938a9..e66ddbf4dd 100644 --- a/asn1/pkcs12/pkcs12.asn +++ b/asn1/pkcs12/pkcs12.asn @@ -1,7 +1,7 @@ PKCS-12 {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) modules(0) pkcs-12(1)} --- $Revision$ +-- $Id$ DEFINITIONS IMPLICIT TAGS ::= diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf index 86146edbbf..b7055a1423 100644 --- a/asn1/pkix1implicit/pkix1implicit.cnf +++ b/asn1/pkix1implicit/pkix1implicit.cnf @@ -9,6 +9,10 @@ PKIX1Explicit93 pkix1explicit #.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf #.IMPORT ../x509ce/x509ce-exp.cnf +#.OMIT_ASSIGNMENT +EDIPartyName +#.END + #.EXPORTS AuthorityInfoAccessSyntax diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c index 970488a6c9..1f3c32b71a 100644 --- a/asn1/pkixtsp/packet-pkixtsp-template.c +++ b/asn1/pkixtsp/packet-pkixtsp-template.c @@ -144,6 +144,6 @@ void proto_reg_handoff_pkixtsp(void) { timestamp_query_handle = new_create_dissector_handle(dissect_timestamp_query, proto_pkixtsp); dissector_add_string("media_type", "application/timestamp-query", timestamp_query_handle); -/*#include "packet-pkixtsp-dis-tab.c"*/ +#include "packet-pkixtsp-dis-tab.c" } diff --git a/asn1/pkixtsp/pkixtsp.cnf b/asn1/pkixtsp/pkixtsp.cnf index 3e055e63f4..ec7499ef19 100644 --- a/asn1/pkixtsp/pkixtsp.cnf +++ b/asn1/pkixtsp/pkixtsp.cnf @@ -26,5 +26,8 @@ TSTInfo/version Tst_version PKIStatusInfo/status pki_status TSTInfo/version tst_version +#.REGISTER +TSTInfo B "1.2.840.113549.1.9.16.1.4" "id-ct-TSTInfo" + #.END diff --git a/epan/dissectors/packet-pkix1implicit.c b/epan/dissectors/packet-pkix1implicit.c index 002b8f98e8..85b40b7657 100644 --- a/epan/dissectors/packet-pkix1implicit.c +++ b/epan/dissectors/packet-pkix1implicit.c @@ -58,8 +58,6 @@ static int proto_pkix1implicit = -1; #line 1 "packet-pkix1implicit-hf.c" static int hf_pkix1implicit_Dummy_PDU = -1; /* Dummy */ static int hf_pkix1implicit_AuthorityInfoAccessSyntax_PDU = -1; /* AuthorityInfoAccessSyntax */ -static int hf_pkix1implicit_nameAssigner = -1; /* DirectoryString */ -static int hf_pkix1implicit_partyName = -1; /* DirectoryString */ static int hf_pkix1implicit_AuthorityInfoAccessSyntax_item = -1; /* AccessDescription */ static int hf_pkix1implicit_accessMethod = -1; /* OBJECT_IDENTIFIER */ static int hf_pkix1implicit_accessLocation = -1; /* GeneralName */ @@ -79,7 +77,6 @@ static int hf_pkix1implicit_utf8String = -1; /* UTF8String */ /*--- Included file: packet-pkix1implicit-ett.c ---*/ #line 1 "packet-pkix1implicit-ett.c" -static gint ett_pkix1implicit_EDIPartyName = -1; static gint ett_pkix1implicit_AuthorityInfoAccessSyntax = -1; static gint ett_pkix1implicit_AccessDescription = -1; static gint ett_pkix1implicit_UserNotice = -1; @@ -127,21 +124,6 @@ dissect_pkix1implicit_Dummy(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of } -static const ber_sequence_t EDIPartyName_sequence[] = { - { &hf_pkix1implicit_nameAssigner, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_pkix1explicit_DirectoryString }, - { &hf_pkix1implicit_partyName, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_pkix1explicit_DirectoryString }, - { NULL, 0, 0, 0, NULL } -}; - -static int -dissect_pkix1implicit_EDIPartyName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { - offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset, - EDIPartyName_sequence, hf_index, ett_pkix1implicit_EDIPartyName); - - return offset; -} - - static int dissect_pkix1implicit_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { @@ -240,7 +222,7 @@ dissect_pkix1implicit_DisplayText(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, static int dissect_pkix1implicit_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -322,14 +304,6 @@ void proto_register_pkix1implicit(void) { { "AuthorityInfoAccessSyntax", "pkix1implicit.AuthorityInfoAccessSyntax", FT_UINT32, BASE_DEC, NULL, 0, "pkix1implicit.AuthorityInfoAccessSyntax", HFILL }}, - { &hf_pkix1implicit_nameAssigner, - { "nameAssigner", "pkix1implicit.nameAssigner", - FT_STRING, BASE_NONE, NULL, 0, - "pkix1explicit.DirectoryString", HFILL }}, - { &hf_pkix1implicit_partyName, - { "partyName", "pkix1implicit.partyName", - FT_STRING, BASE_NONE, NULL, 0, - "pkix1explicit.DirectoryString", HFILL }}, { &hf_pkix1implicit_AuthorityInfoAccessSyntax_item, { "Item", "pkix1implicit.AuthorityInfoAccessSyntax_item", FT_NONE, BASE_NONE, NULL, 0, @@ -384,7 +358,6 @@ void proto_register_pkix1implicit(void) { /*--- Included file: packet-pkix1implicit-ettarr.c ---*/ #line 1 "packet-pkix1implicit-ettarr.c" - &ett_pkix1implicit_EDIPartyName, &ett_pkix1implicit_AuthorityInfoAccessSyntax, &ett_pkix1implicit_AccessDescription, &ett_pkix1implicit_UserNotice, diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index 87865fea85..b87bfc1b67 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -57,6 +57,7 @@ static int proto_pkixtsp = -1; /*--- Included file: packet-pkixtsp-hf.c ---*/ #line 1 "packet-pkixtsp-hf.c" +static int hf_pkixtsp_TSTInfo_PDU = -1; /* TSTInfo */ static int hf_pkixtsp_version = -1; /* T_version */ static int hf_pkixtsp_messageImprint = -1; /* MessageImprint */ static int hf_pkixtsp_reqPolicy = -1; /* TSAPolicyId */ @@ -122,7 +123,7 @@ static const value_string pkixtsp_T_version_vals[] = { static int dissect_pkixtsp_T_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -166,7 +167,7 @@ dissect_pkixtsp_TSAPolicyId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_pkixtsp_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -214,7 +215,7 @@ static const value_string pkixtsp_PKIStatus_vals[] = { static int dissect_pkixtsp_PKIStatus(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -290,7 +291,7 @@ static const value_string pkixtsp_Tst_version_vals[] = { static int dissect_pkixtsp_Tst_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -309,7 +310,7 @@ dissect_pkixtsp_GeneralizedTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in static int dissect_pkixtsp_INTEGER_1_999(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index, - NULL); + NULL); return offset; } @@ -353,6 +354,14 @@ dissect_pkixtsp_TSTInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset return offset; } +/*--- PDUs ---*/ + +static void dissect_TSTInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_) { + asn1_ctx_t asn1_ctx; + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); + dissect_pkixtsp_TSTInfo(FALSE, tvb, 0, &asn1_ctx, tree, hf_pkixtsp_TSTInfo_PDU); +} + /*--- End of included file: packet-pkixtsp-fn.c ---*/ #line 57 "packet-pkixtsp-template.c" @@ -419,6 +428,10 @@ void proto_register_pkixtsp(void) { /*--- Included file: packet-pkixtsp-hfarr.c ---*/ #line 1 "packet-pkixtsp-hfarr.c" + { &hf_pkixtsp_TSTInfo_PDU, + { "TSTInfo", "pkixtsp.TSTInfo", + FT_NONE, BASE_NONE, NULL, 0, + "pkixtsp.TSTInfo", HFILL }}, { &hf_pkixtsp_version, { "version", "pkixtsp.version", FT_INT32, BASE_DEC, VALS(pkixtsp_T_version_vals), 0, @@ -583,6 +596,13 @@ void proto_reg_handoff_pkixtsp(void) { timestamp_query_handle = new_create_dissector_handle(dissect_timestamp_query, proto_pkixtsp); dissector_add_string("media_type", "application/timestamp-query", timestamp_query_handle); -/*#include "packet-pkixtsp-dis-tab.c"*/ + +/*--- Included file: packet-pkixtsp-dis-tab.c ---*/ +#line 1 "packet-pkixtsp-dis-tab.c" + register_ber_oid_dissector("1.2.840.113549.1.9.16.1.4", dissect_TSTInfo_PDU, proto_pkixtsp, "id-ct-TSTInfo"); + + +/*--- End of included file: packet-pkixtsp-dis-tab.c ---*/ +#line 148 "packet-pkixtsp-template.c" } |