Drop patches 17_fix_from_1.8.3_* which were cherry-picked from 1.8.3 and are no longe...
authorRaphaël Hertzog <hertzog@debian.org>
Fri, 8 Feb 2013 16:50:01 +0000 (17:50 +0100)
committerRaphaël Hertzog <hertzog@debian.org>
Fri, 8 Feb 2013 16:50:01 +0000 (17:50 +0100)
debian/changelog
debian/patches/17_fix_from_1.8.3_fix_HSRP_crash.patch [deleted file]
debian/patches/17_fix_from_1.8.3_fix_LDP_crash.patch [deleted file]
debian/patches/17_fix_from_1.8.3_fix_PPP_crash.patch [deleted file]
debian/patches/17_fix_from_1.8.3_fix_infinite_loop_in_DRDA_dissector.patch [deleted file]
debian/patches/series

index 64804bd..a87a5b8 100644 (file)
@@ -1,6 +1,8 @@
 wireshark (1.8.5-0kali1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop patches 17_fix_from_1.8.3_* which were cherry-picked from 1.8.3
+    and are no longer needed.
 
  -- Raphaël Hertzog <hertzog@debian.org>  Fri, 08 Feb 2013 17:33:21 +0100
 
diff --git a/debian/patches/17_fix_from_1.8.3_fix_HSRP_crash.patch b/debian/patches/17_fix_from_1.8.3_fix_HSRP_crash.patch
deleted file mode 100644 (file)
index 7794dac..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-From a98fae4a9fafb9fac459d67d13525af5e726fbca Mon Sep 17 00:00:00 2001
-From: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date: Sun, 12 Aug 2012 15:08:00 +0000
-Subject: [PATCH 1/4] Revert r41311, fix bug #7581
-
-svn path=/trunk/; revision=44454
----
- epan/dissectors/packet-hsrp.c |   10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c
-index 3db3d4f..866249d 100644
---- a/epan/dissectors/packet-hsrp.c
-+++ b/epan/dissectors/packet-hsrp.c
-@@ -411,6 +411,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-                                                      auth_buf);
-                               offset += 8;
-                               proto_tree_add_item(hsrp_tree, hf_hsrp_virt_ip_addr, tvb, offset, 4, ENC_BIG_ENDIAN);
-+                              /* offset += 4; */
-                       } else if (opcode == 3) {
-                               proto_tree_add_item(hsrp_tree, hf_hsrp_adv_type, tvb, offset, 2, ENC_BIG_ENDIAN);
-                               offset += 2;
-@@ -425,6 +426,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-                               proto_tree_add_item(hsrp_tree, hf_hsrp_adv_passivegrp, tvb, offset, 2, ENC_BIG_ENDIAN);
-                               offset += 2;
-                               proto_tree_add_item(hsrp_tree, hf_hsrp_adv_reserved2, tvb, offset, 4, ENC_BIG_ENDIAN);
-+                              /* offset += 4; */
-                       } else {
-                               next_tvb = tvb_new_subset_remaining(tvb, offset);
-                               call_dissector(data_handle, next_tvb, pinfo, hsrp_tree);
-@@ -433,7 +435,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-         } else if ((pinfo->dst.type == AT_IPv4 && strcmp(dst,HSRP2_DST_IP_ADDR) == 0) ||
-                  (pinfo->dst.type == AT_IPv6 && pinfo->destport == UDP_PORT_HSRP2_V6)) {
-                 /* HSRPv2 */
--                guint offset = 0;
-+                guint offset = 0, offset2;
-                 proto_item *ti = NULL;
-                 proto_tree *hsrp_tree = NULL;
-                 guint8 type,len;
-@@ -449,6 +451,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-                         type = tvb_get_guint8(tvb, offset);
-                         len = tvb_get_guint8(tvb, offset+1);
-+                        offset2 = offset;
-                         if (type == 1 && len == 40) {
-                                 /* Group State TLV */
-                                 guint8 opcode, state = 0, ipver;
-@@ -516,6 +519,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-                                               call_dissector(data_handle, next_tvb, pinfo, hsrp_tree);
-                                                 break;
-                                       }
-+                                      /* offset+=16; */
-                               }
-                         } else if (type == 2 && len == 4) {
-                                 /* Interface State TLV */
-@@ -538,6 +542,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-                                       proto_tree_add_item(interface_state_tlv, hf_hsrp2_active_group, tvb, offset, 2, ENC_BIG_ENDIAN);
-                                         offset+=2;
-                                       proto_tree_add_item(interface_state_tlv, hf_hsrp2_passive_group, tvb, offset, 2, ENC_BIG_ENDIAN);
-+                                      /* offset+=2; */
-                                 }
-                         } else if (type == 3 && len == 8) {
-                                 /* Text Authentication TLV */
-@@ -558,6 +563,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-                                                              "Authentication Data: %sDefault (%s)",
-                                                              (tvb_strneql(tvb, offset, "cisco", strlen("cisco"))) == 0 ? "" : "Non-",
-                                                              auth_buf);
-+                                      /* offset += 8; */
-                                 }
-                         } else if (type == 4 && len == 28) {
-                                 /* Text Authentication TLV */
-@@ -581,6 +587,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-                                         proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_key_id, tvb, offset, 4, ENC_BIG_ENDIAN);
-                                         offset+=4;
-                                         proto_tree_add_item(md5_auth_tlv, hf_hsrp2_md5_auth_data, tvb, offset, 16, ENC_BIG_ENDIAN);
-+                                        /* offset += 16; */
-                                 }
-                         } else {
-                                 /* Undefined TLV */
-@@ -590,6 +597,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-                               }
-                                 break;
-                       }
-+                      offset = offset2+len+2;
-               }
-         }
--- 
-1.7.10.4
-
diff --git a/debian/patches/17_fix_from_1.8.3_fix_LDP_crash.patch b/debian/patches/17_fix_from_1.8.3_fix_LDP_crash.patch
deleted file mode 100644 (file)
index 543ecc8..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-From ac3bdf57670fd59afef128b33d11907fc28436ba Mon Sep 17 00:00:00 2001
-From: Jeff Morriss <jeff.morriss.ws@gmail.com>
-Date: Fri, 7 Sep 2012 01:35:16 +0000
-Subject: [PATCH 4/4] From Aditya Ambadkar via
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7046
- :
-
-Fix CID 703472 and (external) fuzz failure 7567:
-
-The dissect_subtlv_interface_parameters is missing the handling of BFD 2..4.
-For the crash patch, we decided to add the bfd2..4 in dissect_tlc function(in
-the diff). We plan to open a separate bug to fix
-dissect_subtlv_interface_parameters to make it handle BFD2..4. (Thanks to Arun
-Arunachalam for this analysis)
-
-From me: fix up some indentation and replace tabs with spaces (for consistency).
-
-svn path=/trunk/; revision=44801
----
- epan/dissectors/packet-ldp.c |   20 +++++++++++++-------
- 1 file changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
-index 86a6301..4d08088 100644
---- a/epan/dissectors/packet-ldp.c
-+++ b/epan/dissectors/packet-ldp.c
-@@ -2459,7 +2459,13 @@ dissect_tlv(tvbuff_t *tvb, guint offset, proto_tree *tree, int rem)
-                 &hf_ldp_tlv_intparam_vccv_cctype_ttl1 ,
-                 &hf_ldp_tlv_intparam_vccv_cvtype_icmpping ,
-                 &hf_ldp_tlv_intparam_vccv_cvtype_lspping ,
--                &hf_ldp_tlv_intparam_vccv_cvtype_bfd
-+                &hf_ldp_tlv_intparam_vccv_cvtype_bfd,
-+                &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd2,
-+                &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd3,
-+                &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd4,
-+                &hf_ldp_tlv_fec_vc_intparam_flowlabel_t,
-+                &hf_ldp_tlv_fec_vc_intparam_flowlabel_r,
-+                &hf_ldp_tlv_fec_vc_intparam_flowlabel_res
-             };
-             int vc_len = length;
-             offset += 4;
-@@ -3568,25 +3574,25 @@ proto_register_ldp(void)
-           { "BFD IP/UDP-encapsulated, for PW Fault Detection only", "ldp.msg.tlv.fec.vc.intparam.vccv.cvtype_bfd1", FT_BOOLEAN, 8,
-             NULL, 0x04, "VC FEC Interface Param VCCV CV Type BFD IP/UDP-encapsulated, for PW Fault Detection only", HFILL }},
--      { &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd2,
-+        { &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd2,
-           { "BFD IP/UDP-encapsulated, for PW Fault Detection and AC/PW Fault Status Signaling", "ldp.msg.tlv.fec.vc.intparam.vccv.cvtype_bfd2", FT_BOOLEAN, 8,
-             NULL, 0x08, "VC FEC Interface Param VCCV CV Type BFD IP/UDP-encapsulated, for PW Fault Detection and AC/PW Fault Status Signaling", HFILL }},
--      { &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd3,
-+        { &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd3,
-           { "BFD BFD PW-ACH-encapsulated, for PW Fault Detection only", "ldp.msg.tlv.fec.vc.intparam.vccv.cvtype_bfd3", FT_BOOLEAN, 8,
-             NULL, 0x10, "VC FEC Interface Param VCCV CV Type BFD PW-ACH-encapsulated, for PW Fault Detection only", HFILL }},
--      { &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd4,
-+        { &hf_ldp_tlv_fec_vc_intparam_vccv_cvtype_bfd4,
-           { "BFD BFD PW-ACH-encapsulated, for PW Fault Detection and AC/PW Fault Status Signaling", "ldp.msg.tlv.fec.vc.intparam.vccv.cvtype_bfd4", FT_BOOLEAN, 8,
-             NULL, 0x20, "VC FEC Interface Param VCCV CV Type BFD PW-ACH-encapsulated, for PW Fault Detection and AC/PW Fault Status Signaling", HFILL }},
--      { &hf_ldp_tlv_fec_vc_intparam_flowlabel_t,
-+        { &hf_ldp_tlv_fec_vc_intparam_flowlabel_t,
-           { "Flow Label Transmit bit", "ldp.msg.tlv.fec.vc.intparam.flowlabel.t", FT_UINT8, BASE_DEC, NULL, 0x80, NULL, HFILL}},
--      { &hf_ldp_tlv_fec_vc_intparam_flowlabel_r,
-+        { &hf_ldp_tlv_fec_vc_intparam_flowlabel_r,
-           { "Flow Label Receive bit", "ldp.msg.tlv.fec.vc.intparam.flowlabel.r", FT_UINT8, BASE_DEC, NULL, 0x40, NULL, HFILL}},
--    { &hf_ldp_tlv_fec_vc_intparam_flowlabel_res,
-+        { &hf_ldp_tlv_fec_vc_intparam_flowlabel_res,
-           { "Flow Label Reserved", "ldp.msg.tlv.fec.vc.intparam.flowlabel.res", FT_UINT16, BASE_HEX, NULL, 0x3FFF, NULL, HFILL}},
-         { &hf_ldp_tlv_lspid_act_flg,
--- 
-1.7.10.4
-
diff --git a/debian/patches/17_fix_from_1.8.3_fix_PPP_crash.patch b/debian/patches/17_fix_from_1.8.3_fix_PPP_crash.patch
deleted file mode 100644 (file)
index bd1e00b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From cfbeab2a4421ca0ba8f19d3958abe9e2fc5898bc Mon Sep 17 00:00:00 2001
-From: Jakub Zawadzki <darkjames-ws@darkjames.pl>
-Date: Tue, 28 Aug 2012 08:44:41 +0000
-Subject: [PATCH 2/4] Fix bug #7668
-
-Use correct field type for lcp.opt.oui
-
-svn path=/trunk/; revision=44688
----
- epan/dissectors/packet-ppp.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
-index ca740c5..6109313 100644
---- a/epan/dissectors/packet-ppp.c
-+++ b/epan/dissectors/packet-ppp.c
-@@ -5570,7 +5570,7 @@ proto_register_lcp(void)
-             { "Length", "lcp.opt.length", FT_UINT8, BASE_DEC,
-                 NULL, 0x0, NULL, HFILL }},
-         { &hf_lcp_opt_oui,
--            { "OUI", "lcp.opt.oui", FT_BYTES, BASE_NONE,
-+            { "OUI", "lcp.opt.oui", FT_UINT24, BASE_HEX,
-                 NULL, 0x0, NULL, HFILL }},
-         { &hf_lcp_opt_kind,
-             { "Kind", "lcp.opt.kind", FT_UINT8, BASE_DEC_HEX,
--- 
-1.7.10.4
-
diff --git a/debian/patches/17_fix_from_1.8.3_fix_infinite_loop_in_DRDA_dissector.patch b/debian/patches/17_fix_from_1.8.3_fix_infinite_loop_in_DRDA_dissector.patch
deleted file mode 100644 (file)
index 8f624c6..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2105bbdfcf11082765daba013b64f1c37aaf6245 Mon Sep 17 00:00:00 2001
-From: Pascal Quantin <pascal.quantin@gmail.com>
-Date: Mon, 3 Sep 2012 12:48:57 +0000
-Subject: [PATCH 3/4] Fix
- https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7666
- : Check that DRDA command has a minimum length of 10
- bytes to prevent a potential infinite loop
-
-svn path=/trunk/; revision=44749
----
- epan/dissectors/packet-drda.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c
-index f5d701b..730f687 100644
---- a/epan/dissectors/packet-drda.c
-+++ b/epan/dissectors/packet-drda.c
-@@ -55,6 +55,7 @@
- #include <epan/packet.h>
- #include <epan/conversation.h>
- #include <epan/prefs.h>
-+#include <epan/expert.h>
- #include "packet-tcp.h"
- static int proto_drda = -1;
-@@ -696,6 +697,10 @@ dissect_drda(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-     {
-         iCommand = tvb_get_ntohs(tvb, offset + 8);
-         iLength = tvb_get_ntohs(tvb, offset + 0);
-+        if (iLength < 10) {
-+            expert_add_info_format(pinfo, NULL, PI_MALFORMED, PI_ERROR, "Invalid length detected (%u): should be at least 10 bytes long", iLength);
-+            break;
-+        }
-         /* iCommandEnd is the length of the packet up to the end of the current command */
-         iCommandEnd += iLength;
--- 
-1.7.10.4
-
index 4c1cbe7..604a562 100644 (file)
@@ -6,7 +6,3 @@
 06_release-version.patch
 09_idl2wrs.patch
 16_licence_about_location.patch
-17_fix_from_1.8.3_fix_HSRP_crash.patch
-17_fix_from_1.8.3_fix_infinite_loop_in_DRDA_dissector.patch
-17_fix_from_1.8.3_fix_LDP_crash.patch
-17_fix_from_1.8.3_fix_PPP_crash.patch