get rid of get_ber_last_created_item()

svn path=/trunk/; revision=24002

diff --git a/asn1/pkcs12/pkcs12.cnf b/asn1/pkcs12/pkcs12.cnf
index 843fdaf6e385efbdd73d8b76aaeaf01398561531..1d7f470fdb3ebe499c351cfae4cf8d78a52c98d8 100644 (file)
--- a/asn1/pkcs12/pkcs12.cnf
+++ b/asn1/pkcs12/pkcs12.cnf
@@ -140,17 +140,17 @@ PrivateKeyInfo
 #.FN_HDR EncryptedData
        tvbuff_t *encrypted_tvb;
        dissector_handle_t dissector_handle;
-       proto_item *item;
+       
 #.END
 
 #.FN_FTR EncryptedData
 
-       item = get_ber_last_created_item();
+       
 
        dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12);
        dissector_change_string("ber.oid", (gchar*) object_identifier_id, dissector_handle);
        
-       PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, item);
+       PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item);
        
        /* restore the original dissector */
        dissector_reset_string("ber.oid", object_identifier_id);

diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index 692d8c22ea1082936953de57ec7b94a237f3c199..265a3fd98a41a849ed73eb518afe21916f42f434 100644 (file)
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-pkcs12.c                                                            */
-/* ../../tools/asn2wrs.py -X -T -b -e -p pkcs12 -c pkcs12.cnf -s packet-pkcs12-template pkcs12.asn */
+/* ../../tools/asn2wrs.py -b -e -p pkcs12 -c pkcs12.cnf -s packet-pkcs12-template pkcs12.asn */
 
 /* Input file: packet-pkcs12-template.c */
 
@@ -791,19 +791,19 @@ dissect_pkcs12_EncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 #line 141 "pkcs12.cnf"
        tvbuff_t *encrypted_tvb;
        dissector_handle_t dissector_handle;
-       proto_item *item;
+       
 
   offset = dissect_ber_octet_string(implicit_tag, actx, tree, tvb, offset, hf_index,
                                        &encrypted_tvb);
 
 #line 147 "pkcs12.cnf"
 
-       item = get_ber_last_created_item();
+       
 
        dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12);
        dissector_change_string("ber.oid", (gchar*) object_identifier_id, dissector_handle);
        
-       PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, item);
+       PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item);
        
        /* restore the original dissector */
        dissector_reset_string("ber.oid", object_identifier_id);

diff --git a/epan/dissectors/packet-pkcs12.h b/epan/dissectors/packet-pkcs12.h
index 5615134603f32e5fab6f61baf95ddbae92d42671..15a9af77e2ab05fe7c6ca1c51eecd8f6ab7d7b96 100644 (file)
--- a/epan/dissectors/packet-pkcs12.h
+++ b/epan/dissectors/packet-pkcs12.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-pkcs12.h                                                            */
-/* ../../tools/asn2wrs.py -X -T -b -e -p pkcs12 -c pkcs12.cnf -s packet-pkcs12-template pkcs12.asn */
+/* ../../tools/asn2wrs.py -b -e -p pkcs12 -c pkcs12.cnf -s packet-pkcs12-template pkcs12.asn */
 
 /* Input file: packet-pkcs12-template.h */