From dafdc19d9ef7e437daa07ebf84744e79e3602064 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Thu, 28 Mar 2013 07:34:13 +0000 Subject: -Wmissing-prototypes svn path=/trunk/; revision=48609 --- epan/dissectors/packet-pkcs12.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'epan/dissectors/packet-pkcs12.c') diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index da26ee768b..811d5ccbea 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -65,6 +65,9 @@ #define PKCS12_PBE_3DES_SHA1_OID "1.2.840.113549.1.12.1.3" #define PKCS12_PBE_RC2_40_SHA1_OID "1.2.840.113549.1.12.1.6" +void proto_register_pkcs12(void); +void proto_reg_handoff_pkcs12(void); + /* Initialize the protocol and registered fields */ static int proto_pkcs12 = -1; @@ -140,7 +143,7 @@ static int hf_pkcs12_encryptionScheme = -1; /* AlgorithmIdentifier */ static int hf_pkcs12_messageAuthScheme = -1; /* AlgorithmIdentifier */ /*--- End of included file: packet-pkcs12-hf.c ---*/ -#line 77 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 80 "../../asn1/pkcs12/packet-pkcs12-template.c" /* Initialize the subtree pointers */ @@ -168,7 +171,7 @@ static gint ett_pkcs12_PBES2Params = -1; static gint ett_pkcs12_PBMAC1Params = -1; /*--- End of included file: packet-pkcs12-ett.c ---*/ -#line 80 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 83 "../../asn1/pkcs12/packet-pkcs12-template.c" static void append_oid(proto_tree *tree, const char *oid) { @@ -1124,7 +1127,7 @@ static void dissect_PBMAC1Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, /*--- End of included file: packet-pkcs12-fn.c ---*/ -#line 381 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 384 "../../asn1/pkcs12/packet-pkcs12-template.c" static int strip_octet_string(tvbuff_t *tvb) { @@ -1412,7 +1415,7 @@ void proto_register_pkcs12(void) { "AlgorithmIdentifier", HFILL }}, /*--- End of included file: packet-pkcs12-hfarr.c ---*/ -#line 448 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 451 "../../asn1/pkcs12/packet-pkcs12-template.c" }; /* List of subtrees */ @@ -1443,7 +1446,7 @@ void proto_register_pkcs12(void) { &ett_pkcs12_PBMAC1Params, /*--- End of included file: packet-pkcs12-ettarr.c ---*/ -#line 454 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 457 "../../asn1/pkcs12/packet-pkcs12-template.c" }; module_t *pkcs12_module; @@ -1504,7 +1507,7 @@ void proto_reg_handoff_pkcs12(void) { /*--- End of included file: packet-pkcs12-dis-tab.c ---*/ -#line 486 "../../asn1/pkcs12/packet-pkcs12-template.c" +#line 489 "../../asn1/pkcs12/packet-pkcs12-template.c" register_ber_oid_dissector("1.2.840.113549.1.9.22.1", dissect_X509Certificate_OCTETSTRING_PDU, proto_pkcs12, "x509Certificate"); -- cgit v1.2.3