From 7f56a20e1e701216b3c31c3540022f604978b1e3 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Thu, 25 Feb 2016 15:13:46 -0800 Subject: Build 1.12.10. Change-Id: I9ac125306dc973dfcab9b2aaf064568d92e42e24 Reviewed-on: https://code.wireshark.org/review/14176 Reviewed-by: Gerald Combs --- ChangeLog | 752 +++++++++++++++++++++++++++++++++++++++++ NEWS | 272 ++++++--------- docbook/release-notes.asciidoc | 37 +- epan/CMakeLists.txt | 2 +- version.conf | 12 +- wiretap/CMakeLists.txt | 2 +- 6 files changed, 891 insertions(+), 186 deletions(-) diff --git a/ChangeLog b/ChangeLog index e69de29bb2..eff081d4e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,752 @@ +commit cc50b91 +Author: Gerald Combs +Date: Thu Feb 25 15:13:46 2016 -0800 + + Prep for 1.12.10. + + Change-Id: I9ac125306dc973dfcab9b2aaf064568d92e42e24 + +commit 8f7a26e +Author: Peter Wu +Date: Wed Feb 24 03:06:46 2016 +0100 + + ber: avoid deep recursion for constructed strings + + Bound the recursion depth to avoid a stack overflow while parsing a + deeply nested constructed string. + + Call chain before this patch: + + - dissect_ber_octet_string + - dissect_ber_constrained_octet_string + - reassemble_octet_string (called for constructed types) + - dissect_ber_octet_string *recursion* + + After this patch, the reassemble_octet_string will throw if the maximum + recursion depth is reached. + + Bug: 11822 + Change-Id: I6753e3c9f5dcbfab0e4c174418b2c7eb784d64d2 + Reviewed-on: https://code.wireshark.org/review/14108 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit 9ff932bf5ea554f9e94ee1364284aff9eb3fd619) + Reviewed-on: https://code.wireshark.org/review/14110 + (cherry picked from commit 307bbd253fc61657935eca992ec9325dbfff3274) + Reviewed-on: https://code.wireshark.org/review/14111 + +commit ce2a840 +Author: Gerald Combs +Date: Sun Feb 21 08:24:34 2016 -0800 + + [Automatic update for 2016-02-21] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I38a7ee2034cdf8cebaee545dd9db5091c39d10d5 + Reviewed-on: https://code.wireshark.org/review/14056 + Reviewed-by: Gerald Combs + +commit 2dd323b +Author: Peter Wu +Date: Sat Feb 20 16:02:54 2016 +0100 + + Fix various off-by-one in buffer sizes + + Some only allow buffer overruns (read), others also buffer overflows + (write). + + Found by looking for '\[ *N *\]' where N is 255, 0xff, 15 and 0xf (case + insensitive). + + Change-Id: I250687e2fdeb8fbd5eaf0bbb8251c3dab9640760 + Reviewed-on: https://code.wireshark.org/review/14034 + Reviewed-by: Peter Wu + (cherry picked from commit 3b644a75c9530b8fc60e2fa964dfb2ae327e240d) + [Trivial conflict resolution] + Reviewed-on: https://code.wireshark.org/review/14039 + +commit c43f94f +Author: Peter Wu +Date: Sat Feb 20 15:06:50 2016 +0100 + + ber: fix buffer overrun when handling empty sets + + When a set is empty, only a terminator (ber_sequence_t with NULL func) + is present. In that case, do not try to find more values as that will + never succeed. + + Bug: 12106 + Change-Id: I26cd4ba84a9580e92d5921592a27c2af17c0bebf + Reviewed-on: https://code.wireshark.org/review/14028 + Petri-Dish: Peter Wu + Tested-by: Petri Dish Buildbot + Reviewed-by: Peter Wu + (cherry picked from commit 55b5b7caf3ec4856838b0416d5a91d3a3ff67ec8) + Reviewed-on: https://code.wireshark.org/review/14036 + +commit 1d5f600 +Author: Peter Wu +Date: Sat Feb 20 15:27:40 2016 +0100 + + gsm_abis_oml: fix buffer overrun + + Do not read outside boundaries when tag is exactly 0xff. + + tag = tvb_get_guint8(tvb, offset); + tdef = find_tlv_tag(tag); + ... + return &nm_att_tlvdef_base.def[tag]; + + Bug: 11825 + Change-Id: I42e624185abb2166aa0f8d0dbd71a2a86fc0b18e + Reviewed-on: https://code.wireshark.org/review/14030 + Reviewed-by: Peter Wu + (cherry picked from commit c31425f9ae15067e26ccc6183c206c34713cb256) + Reviewed-on: https://code.wireshark.org/review/14032 + +commit 035c0f9 +Author: Gerald Combs +Date: Fri Feb 19 10:39:20 2016 -0800 + + Prep for 1.12.10. + + Change-Id: If724e053e1f2af6a963cc81ffa3e507a88719e1e + Reviewed-on: https://code.wireshark.org/review/14021 + Reviewed-by: Gerald Combs + +commit 08d1876 +Author: Peter Wu +Date: Fri Feb 19 18:36:38 2016 +0100 + + rsl: avoid buffer overread + + Fixes a buffer overrun in dissct_rsl_ipaccess_msg when the tag is + exactly 0xff: + + tag = tvb_get_guint8(tvb, offset); + tdef = &rsl_att_tlvdef.def[tag]; + + Bug: 11829 + Change-Id: I25a3c6948242a52f59431ce84c108b2e52008930 + Reviewed-on: https://code.wireshark.org/review/14011 + Reviewed-by: Peter Wu + (cherry picked from commit de65fd6b00d0b891930324b9549c93ccfe9cac30) + Reviewed-on: https://code.wireshark.org/review/14013 + +commit a1147bf +Author: Gerald Combs +Date: Sun Feb 14 08:20:52 2016 -0800 + + [Automatic update for 2016-02-14] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I84b12b91bda5d59beb7a4d4e8bdd4961a052cd12 + Reviewed-on: https://code.wireshark.org/review/13940 + Reviewed-by: Gerald Combs + +commit 675b36d +Author: Francois Schneider +Date: Thu Feb 11 23:01:00 2016 +0100 + + packetbb: Fix the default value for end-index + + RFC5444 §5.4.1 specifies that for address block TLVs: + end-index := -1 + when both thassingleindex and thasmultiindex = 0. + It was incorrectly initialized to when !=0 + (i.e for address block TLVs). + + Change-Id: I4a78f263ffb122c0d6c0b54b4e8d1d6d525353e0 + Reviewed-on: https://code.wireshark.org/review/13911 + Reviewed-by: Alexis La Goutte + (cherry picked from commit e81ea525655e3c61aaea939283f5beae64e77873) + Reviewed-on: https://code.wireshark.org/review/13918 + +commit 1327968 +Author: Guy Harris +Date: Thu Feb 11 18:13:15 2016 -0800 + + Adjust time stamps even if the secs value of the time stamp is 0. + + If the seconds value in a time stamp is 0, that says nothing whatsoever + about whether it's supported or not - it's the presence flag, which + we've already tested and found to be set, that indicates whether the + time stamp is supported. + + Bug: 12116 + Change-Id: Idaafd5dde6f8d064b6a810e140c200001b0efe34 + Reviewed-on: https://code.wireshark.org/review/13915 + Reviewed-by: Guy Harris + +commit 8774353 +Author: Guy Harris +Date: Tue Feb 9 17:41:04 2016 -0800 + + Don't try reassembly on fragments sliced short during capture. + + While we're at it, get rid of an unnecessary argument passed to the + defragmentation routines - it's always equal to the rpc_defragment + preference variable, so just use that. + + Bug: 11913 + Change-Id: I2f2f7091c6132259ed04b926b4e29d876bff2990 + Reviewed-on: https://code.wireshark.org/review/13862 + Reviewed-by: Guy Harris + +commit f1192a5 +Author: Stig Bjørlykke +Date: Tue Feb 9 00:02:33 2016 +0100 + + Lua: Check out-of-bounds before tvb_strsize() + + Add a check for out-of-bounds before calling tvb_strsize() because + this will THROW an exception if not finding a terminating NUL. + + Unhandled exceptions will mess up Lua luaL_error() handling and + will end up in a crash. + + Change-Id: Ieafef59a3858656e0d8c79904828b631657b4cbc + Reviewed-on: https://code.wireshark.org/review/13842 + Petri-Dish: Stig Bjørlykke + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + Reviewed-on: https://code.wireshark.org/review/13853 + Reviewed-by: Stig Bjørlykke + +commit c1afc0c +Author: Stig Bjørlykke +Date: Sat Nov 14 22:15:21 2015 +0100 + + Lua: Disallow ProtoField FRAMENUM to fetch from Tvb. + + A ProtField type FRAMENUM cannot fetch value from a Tvb. + + Change-Id: Iff0f6df8b00445855c9030dcfa753daa62262171 + Reviewed-on: https://code.wireshark.org/review/11832 + Reviewed-by: Stig Bjørlykke + Reviewed-on: https://code.wireshark.org/review/13852 + +commit 24f8154 +Author: Jaap Keuter +Date: Mon Feb 8 23:27:12 2016 +0100 + + Fix classicstun att_family decoding for IPv6 (CID 280363) + + Remove left over code from adding att_family IPv6. + + Change-Id: I5414eb68f7d25139cb56ea8c5ce6b335ec774df4 + Reviewed-on: https://code.wireshark.org/review/13838 + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit 25ce3a34bd57c305ac0ee93cfe6e09793eb281ac) + Reviewed-on: https://code.wireshark.org/review/13850 + +commit e2d01dd +Author: Pascal Quantin +Date: Mon Feb 8 23:48:39 2016 +0100 + + mpeg-audio: do not put bitrate and sampling rate in source and destination columns + + Instead append them to info column. + + Bug: 12099 + Change-Id: I5451530af2f6cbef519ed541562bffae73e2b1f1 + Reviewed-on: https://code.wireshark.org/review/13841 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit 6ba585c070c21899ca960fe99282162b5c5bf332) + Reviewed-on: https://code.wireshark.org/review/13847 + +commit 74085a5 +Author: Evan Huus +Date: Sat Feb 6 09:33:28 2016 -0500 + + llrp: limit recursion depth + + LLRP defines fairly complex parameter nesting which we handle via recursion, + however this means a large crafted packet could cause very deep stacks and + potentially stack overflows. Limit our recursive depth to an arbitrary, which + should be more than enough for any legitimate packet (I hope). + + Bug: 12048 + Change-Id: I9ac31bddfa4ffd1a79809387d10d2261749b95e7 + Reviewed-on: https://code.wireshark.org/review/13796 + Reviewed-by: Anders Broman + +commit 53c435a +Author: Gerald Combs +Date: Fri Feb 5 11:18:34 2016 -0800 + + Prep for 1.12.10. + + Change-Id: I4d0854d2a9cb688495e8a51ac26624bb6117177a + Reviewed-on: https://code.wireshark.org/review/13840 + Reviewed-by: Gerald Combs + +commit d614a07 +Author: Pascal Quantin +Date: Mon Feb 8 19:55:38 2016 +0100 + + GSM SMS: fix dissection of alphanumeric address + + Change-Id: I5d6f3c78b99979376243f722161b3ae25adad230 + Reviewed-on: https://code.wireshark.org/review/13830 + Reviewed-by: Pascal Quantin + (cherry picked from commit 2e6d7805ede6a3a3a7078422345e7cf743e3486e) + Conflicts: + epan/dissectors/packet-gsm_sms.c + Reviewed-on: https://code.wireshark.org/review/13832 + +commit 0e6b32c +Author: Gerald Combs +Date: Sun Feb 7 08:21:50 2016 -0800 + + [Automatic update for 2016-02-07] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I02f2a1eaa2ddab6985622e62f1a4b53fb26e8b58 + Reviewed-on: https://code.wireshark.org/review/13801 + Reviewed-by: Gerald Combs + +commit f8d67cf +Author: Gerald Combs +Date: Fri Jan 29 10:26:28 2016 -0800 + + Switch from QLibrary to ws_load_library. + + From the comments in qlibrary_win.cpp: + + // We make the following attempts at locating the library: + [ ... ] + // Windows + // if (absolute) + // fileName + // fileName + ".dll" + // else + // fileName + ".dll" + // fileName + + We were passing "riched20.dll" to QLibrary, which meant that it searched + for "riched20.dll.dll" first. + + Switch to ws_load_library, which we use elsewhere and which has much + safer default behavior. + + Conflicts: + ui/qt/wireshark_application.cpp + + Change-Id: Ic8f0cf5686c9b1856d37e76be4404d6236c076e5 + Reviewed-on: https://code.wireshark.org/review/13607 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit 4a79cf2e1ab056faaddd252aa56520435b318a56) + Reviewed-on: https://code.wireshark.org/review/13656 + (cherry picked from commit b33f4c8c610e469b456b089c407b5b55ce4ab1ec) + Reviewed-on: https://code.wireshark.org/review/13747 + +commit b3d7a4f +Author: Pascal Quantin +Date: Wed Feb 3 15:37:01 2016 +0100 + + M3AP: fix dissection of IPAddress field + + Bug: 12070 + Change-Id: Ib516cc3ea7e00a6c4fe1661b9c78b0f6c6a25da6 + Reviewed-on: https://code.wireshark.org/review/13689 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit 1b1b93429af01b13550c985978fa3808296d7f5d) + Conflicts: + asn1/m3ap/m3ap.cnf + epan/dissectors/packet-m3ap.c + Reviewed-on: https://code.wireshark.org/review/13707 + +commit 1646d1a +Author: Alexis La Goutte +Date: Wed Feb 3 22:21:57 2016 +0100 + + OSPF: Wrong interpretation of Instance ID value in OSPFv3 packet + + Reported by Garri + + Bug:12072 + Change-Id: I6f35bdcd54f71138e58048086bf291e5be7967dd + Reviewed-on: https://code.wireshark.org/review/13697 + Reviewed-by: Jaap Keuter + Petri-Dish: Jaap Keuter + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit 2e1c181996ad4029b12fbeec5866d3cdaeb04714) + Reviewed-on: https://code.wireshark.org/review/13702 + (cherry picked from commit bb5235eae02ea8c63e4f5844cc8c5acb9b9578e5) + Reviewed-on: https://code.wireshark.org/review/13703 + +commit b5bcaf5 +Author: Gerald Combs +Date: Sun Jan 31 08:20:55 2016 -0800 + + [Automatic update for 2016-01-31] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I43f18a4f2ae78e7c2a98458795a312d582581d71 + Reviewed-on: https://code.wireshark.org/review/13628 + Reviewed-by: Gerald Combs + +commit 84fba90 +Author: Gerald Combs +Date: Thu Jan 28 17:04:20 2016 -0800 + + Add Authenticode changes to the release notes. + + Windows packages are now signed using SHA-1 and SHA-256. + + Change-Id: Ie9a3bdcd3b5ece2114a4cd21d5ade711e749f4f5 + Reviewed-on: https://code.wireshark.org/review/13592 + Reviewed-by: Gerald Combs + +commit 157a771 +Author: Pascal Quantin +Date: Fri Jan 29 13:18:24 2016 +0100 + + RoHC: fix an assert when dissecting partially an IR-DYN packet + + Change-Id: Ibcb0a109a38524481bc8639bc73ab73acd07ca1a + Reviewed-on: https://code.wireshark.org/review/13598 + Reviewed-by: Pascal Quantin + (cherry picked from commit 4842e4b3032233ec9c269389d102e090db6ee001) + Reviewed-on: https://code.wireshark.org/review/13600 + +commit 8f291a7 +Author: Jaap Keuter +Date: Mon Jan 25 06:33:01 2016 +0100 + + Backport subdir-objects fix + + Basically backport I404b074f1558376064c35d8fc96aea7e3d042a76 since the + same problem as described in bug 10648 applies to master-1.12. + + Change-Id: Icde1f820730e3dc8d7f4f9c69eee58c1110aecbe + Reviewed-on: https://code.wireshark.org/review/13521 + Petri-Dish: Anders Broman + Reviewed-by: Anders Broman + +commit baa21fb +Author: Guy Harris +Date: Mon Jan 25 12:20:08 2016 -0800 + + phdr->pkt_encap needs to be set for seek-read too. + + We set it to the file's value in wtap_read(), but we weren't setting + it in wtap_seek_read(); set it in both places. + + Change-Id: Id604b1c7d27d4cee6600249e9435c49d02f8dd61 + Reviewed-on: https://code.wireshark.org/review/13531 + Reviewed-by: Guy Harris + Reviewed-on: https://code.wireshark.org/review/13533 + +commit 6ee8f78 +Author: Gerald Combs +Date: Sun Jan 24 08:16:21 2016 -0800 + + [Automatic update for 2016-01-24] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I1c943d97dce230f9776c2f9d2dc0eda2740e8ced + Reviewed-on: https://code.wireshark.org/review/13514 + Reviewed-by: Gerald Combs + +commit ca3cfe0 +Author: Pascal Quantin +Date: Fri Jan 22 17:44:23 2016 +0100 + + GSM A DTAP: fix display of calling/called party BCD number in parent tree + + Change-Id: I0a492d1c304c285b831f553158777843ad195c2d + Reviewed-on: https://code.wireshark.org/review/13481 + Reviewed-by: Pascal Quantin + (cherry picked from commit 5f5f16021e42ee3bb5078ae1ae0eb9474709c30a) + Conflicts: + epan/dissectors/packet-gsm_a_dtap.c + Reviewed-on: https://code.wireshark.org/review/13486 + +commit 2177a15 +Author: Guy Harris +Date: Sun Jan 17 17:16:17 2016 -0800 + + Call the "without FCS" version of the Ethernet dissector. + + At least in the sample captures attached to bug 2631, the encapsulated + Ethernet frames don't include the FCS. + + Bug: 9933 + + Change-Id: Ie14b87020c44d739173e5da9fc58a91924f38dfe + Reviewed-on: https://code.wireshark.org/review/13377 + Reviewed-by: Guy Harris + (cherry picked from commit 5fe11fb75964d8e0d87fb73d99aa5f69066b9e8f) + Reviewed-on: https://code.wireshark.org/review/13379 + +commit ed7818a +Author: Guy Harris +Date: Sun Jan 17 11:42:10 2016 -0800 + + Call the "without FCS" version of the Ethernet dissector. + + At least in the sample capture attached to bug 3195, the encapsulated + Ethernet frames don't include the FCS. + + Bug: 9933 + Change-Id: I4440568deaa676ba8848694b80ed800244c8c5d9 + Reviewed-on: https://code.wireshark.org/review/13363 + Reviewed-by: Guy Harris + (cherry picked from commit 278b21329b012ae1081911f95b3d7342444a75da) + Reviewed-on: https://code.wireshark.org/review/13365 + +commit 5e79be0 +Author: Gerald Combs +Date: Sun Jan 17 08:20:23 2016 -0800 + + [Automatic update for 2016-01-17] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I01ac74b785023790babd0e371ce14c849fdcbb7d + Reviewed-on: https://code.wireshark.org/review/13358 + Reviewed-by: Gerald Combs + +commit 089a888 +Author: Guy Harris +Date: Sat Jan 16 20:03:05 2016 -0800 + + Call the "no FCS present" version of the Ethernet dissector. + + I haven't found an official spec for EoIB, but slide 10 of + + http://downloads.openfabrics.org/Media/Sonoma2009/Sonoma_2009_Tues_converged-net-bridging.pdf + + shows the "Eth Payload" following the "Eth Header" and optional "Vlan + tag", and doesn't show an FCS; "Payload" generally refers to the data + transported by the protocol, which wouldn't include the FCS. + + In addition, the capture attached to bug 5061 includes no Ethernet FCS. + + So we assume the Ethernet frames carried by EoIB don't include the + Ethernet FCS. + + Bug: 9933 + Change-Id: I310e5727c42e05498d1f1df08266a48fd6674388 + Reviewed-on: https://code.wireshark.org/review/13351 + Reviewed-by: Guy Harris + (cherry picked from commit 2c3d3435922e5b7da2d3dd819ffb069ca8454664) + Reviewed-on: https://code.wireshark.org/review/13353 + +commit f68b92b +Author: Guy Harris +Date: Sat Jan 16 18:56:45 2016 -0800 + + Use the "no FCS" version of the Ethernet dissector. + + RFC 6325, section 4.1.4 "Frame Check Sequence (FCS)", says + + "Thus, when a frame is encapsulated, the original FCS is not + included but is discarded." + + meaning that the inner Ethernet frame does *not* include an FCS. + + Change-Id: Ie764ceb66dd43b951da015870e3e652ccfc651b5 + Ping-Bug: 9933 + Reviewed-on: https://code.wireshark.org/review/13347 + Reviewed-by: Guy Harris + (cherry picked from commit 24495a1b82e1c9899ee576851ad2fb33201c32ed) + Reviewed-on: https://code.wireshark.org/review/13349 + +commit ca85d10 +Author: Guy Harris +Date: Sat Jan 16 18:45:14 2016 -0800 + + Fix the comment not to mention the group policy I-D. + + This version of the dissector doesn't support it. + + Change-Id: I2777a9bad665082758753e3f53227b28368ccd12 + Reviewed-on: https://code.wireshark.org/review/13346 + Reviewed-by: Guy Harris + +commit 6b9d79f +Author: Guy Harris +Date: Sat Jan 16 18:41:07 2016 -0800 + + Use the "no FCS" version of the Ethernet dissector. + + RFC 7348 Figures 1 and 2, in the Payload section, says + + "(Note that the original Ethernet Frame's FCS is not included)" + + meaning that the inner Ethernet frame does *not* include an FCS. + + Also, update the protocol references (the I-D is now RFC 7348) and add + the I-D for the group policy stuff. + + Remove some extra blank lines while we're at it. + + Change-Id: Ib94a43b95b0761e97d1406a1cca3687ee640e12d + Ping-Bug: 9933 + Reviewed-on: https://code.wireshark.org/review/13343 + Reviewed-by: Guy Harris + (cherry picked from commit 4b663db5aad728a04651bd44ac236a777248aa5a) + Reviewed-on: https://code.wireshark.org/review/13345 + +commit 0f2fb49 +Author: Gerald Combs +Date: Sun Jan 10 08:26:55 2016 -0800 + + [Automatic update for 2016-01-10] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I582b00a409f2113f912240f9e4dc0d0e7841d9b9 + Reviewed-on: https://code.wireshark.org/review/13169 + Reviewed-by: Gerald Combs + +commit ba19a65 +Author: Guy Harris +Date: Wed Jan 6 19:01:39 2016 -0800 + + Don't assume a stat() fails only if the target file doesn't exist. + + If the error is something other than ENOENT, return that error + indication. + + Change-Id: If866cab5f0de0e4fa8b1ed1cead1290feb88a3cb + Reviewed-on: https://code.wireshark.org/review/13091 + Reviewed-by: Guy Harris + (cherry picked from commit 97378a5bad8c20f4364b7fe86d96d9d14a192d48) + Reviewed-on: https://code.wireshark.org/review/13093 + +commit 8b2f332 +Author: Gerald Combs +Date: Sun Jan 3 08:20:58 2016 -0800 + + [Automatic update for 2016-01-03] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I31090dde0ab8e2e9f459ee678a5c0b2c4a6d85a8 + Reviewed-on: https://code.wireshark.org/review/13030 + Reviewed-by: Gerald Combs + +commit 98586d9 +Author: Guy Harris +Date: Sat Jan 2 19:26:04 2016 -0800 + + Clean up error checking and handling. + + The TLV length includes the T and the V, so it must be at least 4; fail + if it's not. + + If the IPv4 or IPv6 prefix length isn't valid, don't bother trying to + parse the rest of the addresses, just give up. + + Don't bother returning offset values that aren't used. + + Rename some routines to indicate that they process more than one item. + + Add some comments while we're at it. + + Change-Id: I6825216f0e7218e230d8d60d958b3c2453a3bb62 + Reviewed-on: https://code.wireshark.org/review/13016 + Reviewed-by: Guy Harris + (cherry picked from commit d4f7f21b51532c1a45a43764fa92cd55e17931de) + Reviewed-on: https://code.wireshark.org/review/13018 + +commit 50fa34b +Author: Stig Bjørlykke +Date: Fri Jan 1 15:33:38 2016 +0100 + + Welcome in 2016, part 2 + + Change-Id: I07b9ba095982225dee8574cefcc7eed3db6fedb1 + Reviewed-on: https://code.wireshark.org/review/12995 + Reviewed-by: Stig Bjørlykke + +commit be29b88 +Author: Pascal Quantin +Date: Fri Jan 1 15:15:29 2016 +0100 + + Welcome in 2016 + + Change-Id: I7f477214c09e98730559a9555c3dd3c3a70b9e91 + Reviewed-on: https://code.wireshark.org/review/12992 + Reviewed-by: Pascal Quantin + +commit 2c75421 +Author: Guy Harris +Date: Thu Dec 31 13:26:23 2015 -0800 + + Use wmem_memdup() instead of wmem_alloc() followed by memcpy(). + + This also fixes a case where, if nfs_fh->len wasn't a multiple of 4, the + allocated buffer was too short, by the difference between the next lower + multiple of 4 and nfs_fh->len, so the memcpy() went past the end of the + buffer. (And, yes, an NFSv3 file handle can have a byte count that's + not a multiple of 4 - it's a variable-length opaque type - even if the + marshalled data is padded with 0s to a multiple of 4 bytes, as with + other XDR types.) + + Change-Id: I689d4b365e8a1547428a1580884f66177dc5841b + Reviewed-on: https://code.wireshark.org/review/12964 + Reviewed-by: Guy Harris + (cherry picked from commit 5a60c0d72e7dfc8c326e854a0d2b739537abb008) + Reviewed-on: https://code.wireshark.org/review/12966 + +commit e5afcea +Author: Pascal Quantin +Date: Wed Dec 30 18:39:35 2015 +0100 + + GTP: fix Dual Stack with one static and one Dynamic IP dissection + + Bug: 11945 + Change-Id: I759baec7c9af6d2502c5d3c151cb5c6adcf3d25f + Reviewed-on: https://code.wireshark.org/review/12950 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + (cherry picked from commit bf8ff48ea27924ff3cef094b4997621519fef7a6) + Conflicts: + epan/dissectors/packet-gtp.c + Reviewed-on: https://code.wireshark.org/review/12952 + +commit 0ca7445 +Author: Michael Mann +Date: Tue Dec 29 22:55:22 2015 -0500 + + Prevent infinite loop in DNP3 dissector. + + Bug: 11941 + Change-Id: Icd59092a3139b8c22f3866017a093a8b1270f1b2 + Reviewed-on: https://code.wireshark.org/review/12941 + Reviewed-by: Anders Broman + +commit 56095cd +Author: Gerald Combs +Date: Tue Dec 29 14:56:17 2015 -0800 + + 1.12.9 → 1.12.10. + + Change-Id: I9b0904918837680326629fe60cace55306c903e1 + Reviewed-on: https://code.wireshark.org/review/12931 + Reviewed-by: Gerald Combs diff --git a/NEWS b/NEWS index 48a64a419f..63c1cee1ee 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ - Wireshark 1.12.9 Release Notes + Wireshark 1.12.10 Release Notes __________________________________________________________________ What is Wireshark? @@ -12,79 +12,40 @@ What's New Bug Fixes The following vulnerabilities have been fixed: - * [1]wnpa-sec-2015-31 - NBAP dissector crashes. ([2]Bug 11602, [3]Bug 11835, [4]Bug 11841) - * [5]wnpa-sec-2015-32 - UMTS FP dissector crashes. ([6]Bug 11602, [7]Bug 11606) - * [8]wnpa-sec-2015-33 - DCOM dissector crash. ([9]Bug 11610) - * [10]wnpa-sec-2015-34 - AllJoyn dissector infinite loop. ([11]Bug 11607) - * [12]wnpa-sec-2015-35 - T.38 dissector crash. ([13]Bug 9887) - * [14]wnpa-sec-2015-36 - SDP dissector crash. ([15]Bug 9887) - * [16]wnpa-sec-2015-37 - NLM dissector crash. - * [17]wnpa-sec-2015-38 - DNS dissector crash. ([18]Bug 10988) - * [19]wnpa-sec-2015-39 - BER dissector crash. - * [20]wnpa-sec-2015-40 - Zlib decompression crash. ([21]Bug 11548) - * [22]wnpa-sec-2015-41 - SCTP dissector crash. ([23]Bug 11767) - * [24]wnpa-sec-2015-42 - 802.11 decryption crash. ([25]Bug 11790, [26]Bug 11826) - * [27]wnpa-sec-2015-43 - DIAMETER dissector crash. ([28]Bug 11792) - * [29]wnpa-sec-2015-44 - VeriWave file parser crashes. ([30]Bug 11789, [31]Bug 11791) - * [32]wnpa-sec-2015-45 - RSVP dissector crash. ([33]Bug 11793) - * [34]wnpa-sec-2015-46 - ANSI A & GSM A dissector crashes. ([35]Bug 11797) - * [36]wnpa-sec-2015-47 - Ascend file parser crash. ([37]Bug 11794) - * [38]wnpa-sec-2015-48 - NBAP dissector crash. ([39]Bug 11815) - * [40]wnpa-sec-2015-49 - RSL dissector crash. ([41]Bug 11829) - * [42]wnpa-sec-2015-50 - ZigBee ZCL dissector crash. ([43]Bug 11830) - * [44]wnpa-sec-2015-51 - Sniffer file parser crash. ([45]Bug 11827) - - The Windows installers are now built using NSIS 2.50 in order to avoid - [46]DLL hijacking flaws. + * [1]wnpa-sec-2016-01 + DLL hijacking vulnerability. [2]CVE-2016-2521 + * [3]wnpa-sec-2016-03 + DNP dissector infinite loop. ([4]Bug 11938) [5]CVE-2016-2523 + * [6]wnpa-sec-2016-10 + RSL dissector crash. ([7]Bug 11829) [8]CVE-2016-2530 + [9]CVE-2016-2531 + * [10]wnpa-sec-2016-11 + LLRP dissector crash. ([11]Bug 12048) [12]CVE-2016-2532 + * [13]wnpa-sec-2016-14 + GSM A-bis OML dissector crash. ([14]Bug 11825) + * [15]wnpa-sec-2016-15 + ASN.1 BER dissector crash. ([16]Bug 12106) + * [17]wnpa-sec-2016-18 + ASN.1 BER dissector crash. ([18]Bug 11822) The following bugs have been fixed: - * Zooming out (Ctrl+-) too far crashes Wireshark. ([47]Bug 8854) - * IPv6 Next Header is Unknown yet Wireshark tries parsing an IPv6 - Extension Header. ([48]Bug 9996) - * IPv6 Mobility Header Link-Layer Address Mobility Option is parsed - incorrectly. ([49]Bug 10627) - * Windows Wireshark Installer does not detect WinPcap which is - already installed. ([50]Bug 10867) - * SSL Decrypted Packet Not Decoded As HTTP. ([51]Bug 10984) - * Wireshark crashes when using the VoIP player. ([52]Bug 11596) - * [GSMTAP] Incorrect decoding of MS Radio Access Capability using - alternative coding. ([53]Bug 11599) - * TCP sequence analysis (expert info) does not work in 802.1ah - frames. ([54]Bug 11629) - * No correct GVCP info message for READREG_ACK command. ([55]Bug - 11639) - * Bug in EtherCAT dissector with mailbox response. ([56]Bug 11652) - * NLM v4 statistics crash. ([57]Bug 11654) - * Malformed packet with IPv6 mobility header. ([58]Bug 11728) - * LDAP decode shows invalid number of results for searchResEntry - packets. ([59]Bug 11761) - * IPv6 RPL Routing Header with length of 8 bytes still reads an - address. ([60]Bug 11803) - * g_utf8_validate assertion when reassembling GSM SMS messages - encoded in UCS2. ([61]Bug 11809) - * MPEG2TS NULL pkt: AFC: "Should be 0 for NULL packets" wrong. - ([62]Bug 11921) + * Questionable calling of ethernet dissector by encapsulating + protocol dissectors. ([19]Bug 9933) + * Improper RPC reassembly ([20]Bug 11913) + * GTPv1 Dual Stack with one static and one Dynamic IP. ([21]Bug + 11945) + * Failed to parse M3AP IE (TNL information). ([22]Bug 12070) + * Wrong interpretation of Instance ID value in OSPFv3 packet. + ([23]Bug 12072) + * MP2T Dissector does parse RTP properly in 2.0.1. ([24]Bug 12099) + * editcap does not adjust time for frames with absolute timestamp 0 < + t < 1 secs. ([25]Bug 12116) + + Windows installers and PortableApps® packages are now dual signed using + SHA-1 and SHA-256 in order to comply with [26]Microsoft Authenticode + policy. Windows 7 and Windows Server 2008 R2 users should ensure that + [27]update 3123479 is installed. Windows Vista and Windows Server 2008 + users should ensure that [28]hotfix 2763674 is installed. New and Updated Features @@ -96,27 +57,24 @@ What's New Updated Protocol Support - 6LoWPAN, 802.1ah, AllJoyn, ANSI A, ASN.1 BER, CLNP, CMS, DCOM, - DIAMETER, DNS, ERF, GSM A, GSM SMS, GTP, GVCP, HiSLIP, IEEE 802.11, - IPv4, IPv6, L2TP, LDAP, MIP6, MP2T, NBAP, NLM, ONC RPC, PCP, RSL, RSVP, - SCTP, SDP, SIGCOMP, SNMP, SPDY, T.38, UMTS FP, and ZigBee ZCL + ASN.1 BER, BATADV, DNP3, E100, EIGRP, GSM A DTAP, GSM SMS, GTP, HiQnet, + InfiniBand, LLRP, M3AP, MP2T, NFS, OSPF, RoHC, RPC, RSL, TRILL, VXLAN, + and X.509AF New and Updated Capture File Support - - Ascend, ERF, Sniffer, and VeriWave __________________________________________________________________ Getting Wireshark Wireshark source code and installation packages are available from - [63]https://www.wireshark.org/download.html. + [29]https://www.wireshark.org/download.html. Vendor-supplied Packages Most Linux and Unix vendors supply their own Wireshark packages. You can usually install or upgrade Wireshark using the package management system specific to that platform. A list of third-party packages can be - found on the [64]download page on the Wireshark web site. + found on the [30]download page on the Wireshark web site. __________________________________________________________________ File Locations @@ -129,127 +87,93 @@ File Locations Known Problems - Dumpcap might not quit if Wireshark or TShark crashes. ([65]Bug 1419) + Dumpcap might not quit if Wireshark or TShark crashes. ([31]Bug 1419) - The BER dissector might infinitely loop. ([66]Bug 1516) + The BER dissector might infinitely loop. ([32]Bug 1516) Capture filters aren't applied when capturing from named pipes. - ([67]Bug 1814) + ([33]Bug 1814) Filtering tshark captures with read filters (-R) no longer works. - ([68]Bug 2234) + ([34]Bug 2234) The 64-bit Windows installer does not support Kerberos decryption. - ([69]Win64 development page) + ([35]Win64 development page) - Resolving ([70]Bug 9044) reopens ([71]Bug 3528) so that Wireshark no + Resolving ([36]Bug 9044) reopens ([37]Bug 3528) so that Wireshark no longer automatically decodes gzip data when following a TCP stream. - Application crash when changing real-time option. ([72]Bug 4035) + Application crash when changing real-time option. ([38]Bug 4035) - Hex pane display issue after startup. ([73]Bug 4056) + Hex pane display issue after startup. ([39]Bug 4056) - Packet list rows are oversized. ([74]Bug 4357) + Packet list rows are oversized. ([40]Bug 4357) Wireshark and TShark will display incorrect delta times in some cases. - ([75]Bug 4985) + ([41]Bug 4985) __________________________________________________________________ Getting Help - Community support is available on [76]Wireshark's Q&A site and on the + Community support is available on [42]Wireshark's Q&A site and on the wireshark-users mailing list. Subscription information and archives for - all of Wireshark's mailing lists can be found on [77]the web site. + all of Wireshark's mailing lists can be found on [43]the web site. Official Wireshark training and certification are available from - [78]Wireshark University. + [44]Wireshark University. __________________________________________________________________ Frequently Asked Questions - A complete FAQ is available on the [79]Wireshark web site. + A complete FAQ is available on the [45]Wireshark web site. __________________________________________________________________ - Last updated 2015-12-29 08:48:09 PST + Last updated 2016-02-26 09:32:05 PST References - 1. https://www.wireshark.org/security/wnpa-sec-2015-31.html - 2. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11602 - 3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11835 - 4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11841 - 5. https://www.wireshark.org/security/wnpa-sec-2015-32.html - 6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11602 - 7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11606 - 8. https://www.wireshark.org/security/wnpa-sec-2015-33.html - 9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11610 - 10. https://www.wireshark.org/security/wnpa-sec-2015-34.html - 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11607 - 12. https://www.wireshark.org/security/wnpa-sec-2015-35.html - 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9887 - 14. https://www.wireshark.org/security/wnpa-sec-2015-36.html - 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9887 - 16. https://www.wireshark.org/security/wnpa-sec-2015-37.html - 17. https://www.wireshark.org/security/wnpa-sec-2015-38.html - 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10988 - 19. https://www.wireshark.org/security/wnpa-sec-2015-39.html - 20. https://www.wireshark.org/security/wnpa-sec-2015-40.html - 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11548 - 22. https://www.wireshark.org/security/wnpa-sec-2015-41.html - 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11767 - 24. https://www.wireshark.org/security/wnpa-sec-2015-42.html - 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11790 - 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11826 - 27. https://www.wireshark.org/security/wnpa-sec-2015-43.html - 28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11792 - 29. https://www.wireshark.org/security/wnpa-sec-2015-44.html - 30. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11789 - 31. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11791 - 32. https://www.wireshark.org/security/wnpa-sec-2015-45.html - 33. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11793 - 34. https://www.wireshark.org/security/wnpa-sec-2015-46.html - 35. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11797 - 36. https://www.wireshark.org/security/wnpa-sec-2015-47.html - 37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11794 - 38. https://www.wireshark.org/security/wnpa-sec-2015-48.html - 39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11815 - 40. https://www.wireshark.org/security/wnpa-sec-2015-49.html - 41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11829 - 42. https://www.wireshark.org/security/wnpa-sec-2015-50.html - 43. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11830 - 44. https://www.wireshark.org/security/wnpa-sec-2015-51.html - 45. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11827 - 46. http://nsis.sourceforge.net/Docs/AppendixF.html - 47. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8854 - 48. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9996 - 49. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10627 - 50. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10867 - 51. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10984 - 52. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11596 - 53. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11599 - 54. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11629 - 55. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11639 - 56. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11652 - 57. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11654 - 58. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11728 - 59. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11761 - 60. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11803 - 61. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11809 - 62. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11921 - 63. https://www.wireshark.org/download.html - 64. https://www.wireshark.org/download.html#thirdparty - 65. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 - 66. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 - 67. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 - 68. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 - 69. https://wiki.wireshark.org/Development/Win64 - 70. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 - 71. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 - 72. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 - 73. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 - 74. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 - 75. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 - 76. https://ask.wireshark.org/ - 77. https://www.wireshark.org/lists/ - 78. http://www.wiresharktraining.com/ - 79. https://www.wireshark.org/faq.html + 1. https://www.wireshark.org/security/wnpa-sec-2016-01.html + 2. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2521 + 3. https://www.wireshark.org/security/wnpa-sec-2016-03.html + 4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11938 + 5. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2523 + 6. https://www.wireshark.org/security/wnpa-sec-2016-10.html + 7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11829 + 8. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2530 + 9. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2531 + 10. https://www.wireshark.org/security/wnpa-sec-2016-11.html + 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12048 + 12. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2532 + 13. https://www.wireshark.org/security/wnpa-sec-2016-14.html + 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11825 + 15. https://www.wireshark.org/security/wnpa-sec-2016-15.html + 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12106 + 17. https://www.wireshark.org/security/wnpa-sec-2016-18.html + 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11822 + 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9933 + 20. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11913 + 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11945 + 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12070 + 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12072 + 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12099 + 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12116 + 26. http://social.technet.microsoft.com/wiki/contents/articles/32288.windows-enforcement-of-authenticode-code-signing-and-timestamping.aspx + 27. https://support.microsoft.com/en-us/kb/3123479 + 28. https://support.microsoft.com/en-us/kb/2763674 + 29. https://www.wireshark.org/download.html + 30. https://www.wireshark.org/download.html#thirdparty + 31. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 + 32. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 + 33. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 + 34. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 + 35. https://wiki.wireshark.org/Development/Win64 + 36. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 + 37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 + 38. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 + 39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 + 40. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 + 41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 + 42. https://ask.wireshark.org/ + 43. https://www.wireshark.org/lists/ + 44. http://www.wiresharktraining.com/ + 45. https://www.wireshark.org/faq.html diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 91eb8be838..1c060235a6 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -17,7 +17,7 @@ The following vulnerabilities have been fixed: + DLL hijacking vulnerability. //(ws-buglink:XXXX[]) -//cve-idlink:2015-XXXX[] +cve-idlink:2016-2521[] // Fixed in master: 4a79cf2 // Fixed in master-2.0: b33f4c8 // Fixed in master-1.12: f8d67cf @@ -26,7 +26,7 @@ DLL hijacking vulnerability. + DNP dissector infinite loop. (ws-buglink:11938[]) -//cve-idlink:2015-XXXX[] +cve-idlink:2016-2523[] // Fixed in master: 260afe1 // Fixed in master-2.0: 0cc86bb // Fixed in master-1.12: 0ca7445 @@ -35,7 +35,8 @@ DNP dissector infinite loop. + RSL dissector crash. (ws-buglink:11829[]) -//cve-idlink:2015-XXXX[] +cve-idlink:2016-2530[] +cve-idlink:2016-2531[] // Fixed in master: 2930d31, de65fd6 // Fixed in master-2.0: aba3635, 0865707 // Fixed in master-1.12: f899e8a, 08d1876 @@ -44,11 +45,38 @@ RSL dissector crash. + LLRP dissector crash. (ws-buglink:12048[]) -//cve-idlink:2015-XXXX[] +cve-idlink:2016-2532[] // Fixed in master: 4a2cd6c // Fixed in master-2.0: 38a01c8 // Fixed in master-1.12: 74085a5 +* ws-salink:2016-14[] ++ +GSM A-bis OML dissector crash. +(ws-buglink:11825[]) +//cve-idlink:2015-XXXX[] +// Fixed in master: c31425f +// Fixed in master-2.0: 9bc329b +// Fixed in master-1.12: 1d5f600 + +* ws-salink:2016-15[] ++ +ASN.1 BER dissector crash. +(ws-buglink:12106[]) +//cve-idlink:2015-XXXX[] +// Fixed in master: 55b5b7c +// Fixed in master-2.0: 271b10d +// Fixed in master-1.12: c43f94f + +* ws-salink:2016-18[] ++ +ASN.1 BER dissector crash. +(ws-buglink:11822[]) +//cve-idlink:2015-XXXX[] +// Fixed in master: 9ff932b +// Fixed in master-2.0: 307bbd2 +// Fixed in master-1.12: 8f7a26e + The following bugs have been fixed: //* Wireshark always manages to score tickets for Burning Man, Coachella, and @@ -88,6 +116,7 @@ There are no new protocols in this release. === Updated Protocol Support --sort-and-group-- +ASN.1 BER BATADV DNP3 E100 diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index e889851aec..c1d7b0742d 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1680,7 +1680,7 @@ add_library(epan ${LINK_MODE_LIB} add_dependencies(epan gitversion) -set(FULL_SO_VERSION "5.0.9") +set(FULL_SO_VERSION "5.0.10") set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") diff --git a/version.conf b/version.conf index 6dedd7c96a..9480b2f829 100644 --- a/version.conf +++ b/version.conf @@ -1,9 +1,9 @@ # Interim releases: Enable packaging, add a "rc" to the version. -enable: 1 -pkg_format: rc0-%# -pkg_enable: 1 +#enable: 1 +#pkg_format: rc0-%# +#pkg_enable: 1 # Final release: Disable package version stamps. -#enable: 1 -#pkg_format: -#pkg_enable: 0 +enable: 1 +pkg_format: +pkg_enable: 0 diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index a66386f095..e10039325c 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -113,7 +113,7 @@ add_library(wiretap ${LINK_MODE_LIB} ${WIRETAP_FILES} ) -set(FULL_SO_VERSION "4.0.9") +set(FULL_SO_VERSION "4.0.10") set_target_properties(wiretap PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") set_target_properties(wiretap PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") -- cgit v1.2.3