diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-07-01 14:17:52 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2020-07-01 21:19:31 +0000 |
| commit | 2a55a135cd0fa0f29d4c9574bafb2e1d2bea3b38 (patch) | |
| tree | 01863ccdfb1f3d9199d61530f0644a5a3af5403a | |
| parent | ed20ddea8138edeef2314d03a6b4a70312367446 (diff) | |
| download | wireshark-3.2.6rc0.tar.gz wireshark-3.2.6rc0.tar.bz2 wireshark-3.2.6rc0.zip | |
3.2.5 → 3.2.6.v3.2.6rc0
Change-Id: Ib55036be4b86a4aa45ec9d595b7e19116bb8423b
Reviewed-on: https://code.wireshark.org/review/37658
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ChangeLog | 826 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | docbook/attributes.adoc | 2 | ||||
| -rw-r--r-- | docbook/release-notes.adoc | 55 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | wiretap/CMakeLists.txt | 2 |
7 files changed, 17 insertions, 874 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e1bfea7087..49b15a6def 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ project(${_project_name} C CXX) set(GIT_REVISION 0) set(PROJECT_MAJOR_VERSION 3) set(PROJECT_MINOR_VERSION 2) -set(PROJECT_PATCH_VERSION 5) +set(PROJECT_PATCH_VERSION 6) set(PROJECT_BUILD_VERSION ${GIT_REVISION}) set(PROJECT_VERSION_EXTENSION "") @@ -1,826 +0,0 @@ -commit 741e3520c6 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Wed Jul 1 09:10:08 2020 +0200 - - coap: Fix "End of Block #" indication - - The M bit is used in Block1 Option in a request and in Block2 Option - in a response. Use this to determine when to prefix the block number - information with "End of". - - Change-Id: I11c741b15f97f68d668d6cbec97660a6ea392dc1 - Reviewed-on: https://code.wireshark.org/review/37631 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 6323e32877 -Author: Jaap Keuter <jaap.keuter@xs4all.nl> -Date: Tue Jun 30 11:50:19 2020 +0200 - - ASTERIX: Fix data item I002/070 - - I002/070 dissection is broken in two ways - - According to spec the name is "Plot Count Values" - - The bitfield for IDENT is interpreted incorrectly - - Bug: 16663 - Change-Id: I224a53bcecf11a3cbc98bfaa3533caf51bea21ec - Reviewed-on: https://code.wireshark.org/review/37615 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 47a1b736bdbbf52b819c0a6525728467fccce800) - Reviewed-on: https://code.wireshark.org/review/37619 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 6153cf6225 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jun 30 11:56:21 2020 -0700 - - Windows: Upgrade Npcap to 0.9994. - - Change-Id: I6872b4905d291a92f07ac947d3b26f0abd0d6f3a - Reviewed-on: https://code.wireshark.org/review/37627 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit eb3f8c2ac5 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jun 30 11:24:46 2020 -0700 - - Prep for 3.2.5. - - Change-Id: I007bfb56f6087f49d5662074d288916c6069bf20 - Reviewed-on: https://code.wireshark.org/review/37624 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 11f40896b6 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Jun 29 15:19:19 2020 -0700 - - GVCP: Fix an infinite loop. - - Remove an "if(tree)" test in order to ensure that our offset always - advances. - - Bug: 16029 - Change-Id: I5bb38f2eccfbf3c44a06682a17aafcba9d8fa0c6 - Reviewed-on: https://code.wireshark.org/review/37611 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit d70bd4489feed4035c3a35cd2e76cdf877b3f485) - Reviewed-on: https://code.wireshark.org/review/37618 - -commit 8f97d25914 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Jun 29 10:16:41 2020 +0200 - - Qt: Accept changes in Decode As when combo box has focus - - Accept changes in the Decode As dialog on Save and Ok even when the - Field or Current combox box still has focus. - - Change-Id: I9d6277ff57714679b574756cbc6d4c4dcb06f8e2 - Reviewed-on: https://code.wireshark.org/review/37580 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit d8a87c34eaa2b28459ca6b7a195c644c5679d81f) - Reviewed-on: https://code.wireshark.org/review/37603 - -commit 7329ce96ec -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Jun 29 13:13:09 2020 +0200 - - epan: Always clear all decode-as when loading entries - - Always call decode_clear_all() when loading decode_as entries because - this function will create decode_build_reset_list based on entries that - has been changed from its original state. - - Ping-Bug: 16635 - Change-Id: Ib589d4bc863b680146063ad682398f6180125a38 - Reviewed-on: https://code.wireshark.org/review/37582 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit ac38c14dd7972c990d44df16f6e8b40b5d77ca3a) - Reviewed-on: https://code.wireshark.org/review/37602 - -commit ca1beb600d -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Jun 29 09:58:51 2020 +0200 - - epan: Keep decode_as_list when changing profile - - The decode_as_list is built at startup and contains all protocols - registered for "decode as". Do not clear this list on profile change, - only on exit. - - Bug: 16635 - Change-Id: I832a042327603ae0f01b10ab620fccc03d4fd3a3 - Reviewed-on: https://code.wireshark.org/review/37579 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit 3dc5f5c2d6352d904e4cfdc03cc9b643122fd368) - Reviewed-on: https://code.wireshark.org/review/37601 - -commit 5846d022e7 -Author: Jaap Keuter <jaap.keuter@xs4all.nl> -Date: Fri Jun 26 22:10:17 2020 +0200 - - DOC: fix layout mergecap manual page - - Bug: 16652 - Change-Id: I2c0e0363b3ea77a616191476d6e27cca1204b7cc - Reviewed-on: https://code.wireshark.org/review/37564 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 5bd9a50e27cb9c2b21bdfd621ed0294d4b9aaea3) - Reviewed-on: https://code.wireshark.org/review/37594 - -commit 27c9ce6d98 -Author: Anders Broman <anders.broman@ericsson.com> -Date: Mon Jun 29 12:48:04 2020 +0200 - - NGAP:n2InfoContainer is also used for datatype N2InfoContainer - - Change-Id: I966f74e9bb4f1155f4884f5e77fd87bae9d46a6b - Reviewed-on: https://code.wireshark.org/review/37581 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - (cherry picked from commit 6ccae11c11cd3a86d3b0d6f20d068bdb1d54c9a9) - Reviewed-on: https://code.wireshark.org/review/37583 - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - -commit b784e28a61 -Author: Anders Broman <anders.broman@ericsson.com> -Date: Tue Mar 10 08:33:27 2020 +0100 - - GTPv2: Length of APN Rate Control Statuses is 2 bytes. - - Change-Id: I501c86b6203a74a252beccf5275677f3bf0f559d - Reviewed-on: https://code.wireshark.org/review/36354 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit e2c07dae199bc5d723efd29e1de9c66cbf5f0318) - Reviewed-on: https://code.wireshark.org/review/37576 - -commit cd2a3c8446 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jun 28 08:31:00 2020 +0000 - - [Automatic update for 2020-06-28] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I14a2b8cfb6206faf043e4756f9c4361909206c48 - Reviewed-on: https://code.wireshark.org/review/37570 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit f9ff7bb602 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Jun 26 10:10:14 2020 +0200 - - coap: Mark private and vendor-specific options as unknown - - Any private or vendor-specific options are not invalid, so mark them - as unknown. Move expert info to option entry. Add the unknown option - number to the item. - - Change-Id: I567c397787d4afddffdca407a8c2e39db828ab83 - Reviewed-on: https://code.wireshark.org/review/37562 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 2dcf32bc9cfc53f558928738c672726d0dd60d94) - Reviewed-on: https://code.wireshark.org/review/37568 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 1431b36bce -Author: Pascal Quantin <pascal@wireshark.org> -Date: Wed Jun 24 12:47:07 2020 +0200 - - NGAP: fix dissection of PWS messages exchanged in Namf interface - - Change-Id: I1d810a0f7de6333938a88bd7616367a687d77e30 - Reviewed-on: https://code.wireshark.org/review/37554 - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit a2afe9b255df28466f17624ad8e1df656d3e7ecd) - Reviewed-on: https://code.wireshark.org/review/37555 - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - -commit 5003e5a74a -Author: Uli Heilmeier <uh@heilmeier.eu> -Date: Sat Jun 13 15:25:16 2020 +0200 - - TCP: show relative numbers only when tcp_analyze_seq is enabled - - Relative sequence numbers work only with tcp.analyze_sequence_numbers - is enabled. Therefore we should also show relative seq numbers only - when both options are enabled. - - Expert info for TFO works also only when tcp_analyze_seq is enabled. - - Bug: 16604 - Change-Id: I0a535c3c8b07a7a7d2c42761df49b5e8ac5b7563 - Reviewed-on: https://code.wireshark.org/review/37469 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Reviewed-on: https://code.wireshark.org/review/37548 - -commit 59a3f3d35c -Author: Guy Harris <gharris@sonic.net> -Date: Sun Jun 21 16:14:25 2020 -0700 - - RTPS: set the "we have an entity ID" flag whenever the entity ID is set. - - Also, remove a comment leftover from an earlier uncommitted version of - these changes. - - Change-Id: I0990a186bc280e11a6d0fda05748f5871fb227f1 - Reviewed-on: https://code.wireshark.org/review/37542 - Reviewed-by: Guy Harris <gharris@sonic.net> - (cherry picked from commit 55a6fee4c1b2904a5627ad129ad09ee00321e9a0) - Reviewed-on: https://code.wireshark.org/review/37543 - -commit 2e3e603b22 -Author: Guy Harris <gharris@sonic.net> -Date: Sun Jun 21 12:01:07 2020 -0700 - - RTPS: don't use incompletely filled in GUIDs. - - Add to the GUID type a bitmask that indicates which fields have been - filled in; start it out as 0, and then set bits in it as fields get - filled in. - - Do not add a type mapping object to the hash table unless the GUID is - completely filled in, and don't look for a type mapping object in the - hash table with a GUID that hasn't been completely filled in as a key. - - Bug: 16642 - Change-Id: I31db92238adcb2ec2d70b2650e41b14d99001908 - Reviewed-on: https://code.wireshark.org/review/37537 - Petri-Dish: Guy Harris <gharris@sonic.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Guy Harris <gharris@sonic.net> - (backported from commit f97e20a011144a56bf72dd92c49167d17713a909) - Reviewed-on: https://code.wireshark.org/review/37539 - -commit e00c70104c -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jun 21 08:29:08 2020 +0000 - - [Automatic update for 2020-06-21] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: Ic4c39e9c0f2ac134fb04851b0c986ea1b3a31609 - Reviewed-on: https://code.wireshark.org/review/37532 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 4b0c9addca -Author: Guy Harris <gharris@sonic.net> -Date: Sat Jun 20 03:14:43 2020 -0700 - - RTPS: initialize the fields_visited memer of a new type mapping object. - - Bug: 16639 - Change-Id: Iac8957b3e2ebd41b636d5853c359954cff796527 - Reviewed-on: https://code.wireshark.org/review/37521 - Petri-Dish: Guy Harris <gharris@sonic.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Guy Harris <gharris@sonic.net> - (cherry picked from commit 6d015cb45404d0f4359786fcf2e5f36395264ecc) - Reviewed-on: https://code.wireshark.org/review/37522 - -commit 2bab48c9b4 -Author: Peter Wu <peter@lekensteyn.nl> -Date: Thu Feb 13 00:53:43 2020 +0000 - - QUIC: add support for Facebook QUIC variant mvfst - - Fix decryption of the Initial Packet for Facebook mvfst, based on IETF - QUIC draft -22. - - Bug: 16378 - Change-Id: I023738f792a68fe020d780e0caee7c6046fe5ca8 - Reviewed-on: https://code.wireshark.org/review/36089 - Petri-Dish: Peter Wu <peter@lekensteyn.nl> - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - (cherry picked from commit eca4bc5682caa85099641893368b770670199303) - Reviewed-on: https://code.wireshark.org/review/37508 - Reviewed-by: Peter Wu <peter@lekensteyn.nl> - -commit f0a86fe718 -Author: Guy Harris <gharris@sonic.net> -Date: Thu Jun 18 11:44:01 2020 -0700 - - radiotap: make tables that we modify automatic rather than static. - - Another instance of this problem that showed up when working on the fix - to the data types of those tables (fixing the data types mean that these - errors cause the conpile to fail; as indicated, that's one reason to fix - them). - - Change-Id: Ia1953b95968101f27fedd98a5fc2854101779deb - Reviewed-on: https://code.wireshark.org/review/37509 - Reviewed-by: Guy Harris <gharris@sonic.net> - (cherry picked from commit 7ba44d9cb2dd98c6f2e156a946973db22ac148fb) - Reviewed-on: https://code.wireshark.org/review/37510 - -commit ced2c83ee8 -Author: Guy Harris <gharris@sonic.net> -Date: Thu Jun 18 00:27:31 2020 -0700 - - radiotap: make tables that we modify automatic rather than static. - - The arrays of pointers to header field hf_ values were getting - overwritten if the fields in question are unknown; that meant that, in - all future dissections, they would be dissected as unknown *even for - packets where they are known*. - - Make them auto arrays, instead, so that each call to the dissector has - its own copy, properly initialized at run time, that it can scribble - over as it chooses without damaging the array for the next call. - - This involves a cast to work around the type of the array argument being - "const int **", which means "pointer to pointer to const int", - not "pointer to const pointer to (non-const) int". That meant that the - scribbling on the static array was *not* detected at compile time. - - Fixing the type is a *lot* of work, but may catch other instances of - this problem, and may prevent future instances of it. That's a project - for a separate commit, however. - - Bug: 16636 - Change-Id: I985157063488739bb59f87780c017e94e2380343 - Reviewed-on: https://code.wireshark.org/review/37502 - Petri-Dish: Guy Harris <gharris@sonic.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Guy Harris <gharris@sonic.net> - (cherry picked from commit 7a526325e9568a0722798dc1f386576464744e77) - Reviewed-on: https://code.wireshark.org/review/37503 - -commit b9a631c9fd -Author: Guy Harris <gharris@sonic.net> -Date: Wed Jun 17 21:21:16 2020 -0700 - - radiotap: fix typo. - - Prof. Doppler's name is spelled with two "p"s. - - Change-Id: Ia25d45b0a890be8c954a67b1ce5860753c1de25d - Reviewed-on: https://code.wireshark.org/review/37498 - Reviewed-by: Guy Harris <gharris@sonic.net> - (cherry picked from commit 6e28c0ff34a032dd10652a82dc9b6a9c5a554966) - Reviewed-on: https://code.wireshark.org/review/37499 - -commit ec0e70a926 -Author: Peter Wu <peter@lekensteyn.nl> -Date: Mon Jun 15 22:06:33 2020 +0200 - - QUIC: fix Malformed Packet exception with small transport parameters - - Since draft 27 the minimum transport parameter size can be smaller than - 4 due to variable-length encoding. With ngtcp2-29-dsb.pcapng, the - active_connection_id_limit at the end covers only three bytes for - example. Even though the correct length is normally set later, the early - attempt to read four bytes resulted in an Malformed Packet exception. - - Change-Id: I9ec6ec6c66ce7a993f2fcfdc987e35966dc809ac - Ping-Bug: 13881 - Reviewed-on: https://code.wireshark.org/review/37483 - Petri-Dish: Peter Wu <peter@lekensteyn.nl> - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - (cherry picked from commit e3d44136f0f0026c5e893fa249f458073f3b7328) - Reviewed-on: https://code.wireshark.org/review/37485 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 89878b36d7 -Author: Guy Harris <gharris@sonic.net> -Date: Tue Jun 16 01:32:41 2020 -0700 - - proto: clean up comments. - - Say "attempt to XXX", as the attempt might not succeed. - - Fix a copied-and-pasted comment to reflect what - proto_is_frame_protocol() does. - - Change-Id: Ia16a98064b87001f019fda43f2db2970a89e355e - Reviewed-on: https://code.wireshark.org/review/37486 - Reviewed-by: Guy Harris <gharris@sonic.net> - (cherry picked from commit b841c1793f954668953e6d1e187fca9e68354e51) - Reviewed-on: https://code.wireshark.org/review/37487 - -commit 1249f4dd43 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jun 14 08:28:10 2020 +0000 - - [Automatic update for 2020-06-14] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I248773bed934fe3385edcd0bfaca0a290c8bb79d - Reviewed-on: https://code.wireshark.org/review/37472 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 38eff5e21f -Author: Pascal Quantin <pascal@wireshark.org> -Date: Thu Jun 11 16:16:51 2020 +0200 - - NGAP: fix dissection of NASC field - - Change-Id: Ia92b5b16d735062afdaeba4560539fa24e2feb1c - Reviewed-on: https://code.wireshark.org/review/37458 - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - (cherry picked from commit 07ca55323fc1e74400d0cacb3da8c77f5d314a4b) - Conflicts: - epan/dissectors/asn1/ngap/ngap.cnf - epan/dissectors/packet-ngap.c - Reviewed-on: https://code.wireshark.org/review/37460 - -commit 874420c16a -Author: Pascal Quantin <pascal@wireshark.org> -Date: Thu Jun 11 15:57:23 2020 +0200 - - LTE RRC: dissect nas-SecurityParamFromEUTRA for the 5GS to EPS handover case - - Change-Id: I3bc14209ad1be8d4f8bdac710baf04a29b521c93 - Reviewed-on: https://code.wireshark.org/review/37457 - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - (cherry picked from commit 3d9b2807aa9641a726b04fde4d8777f90b477d66) - Reviewed-on: https://code.wireshark.org/review/37459 - -commit a03eaf686b -Author: Pascal Quantin <pascal@wireshark.org> -Date: Wed Jun 10 23:27:45 2020 +0200 - - NSIS: remove translations sub folder before styles parent folder - - Bug: 16601 - Change-Id: I8abe331109fdf4287a6ee5a6d054e85aa710e559 - Reviewed-on: https://code.wireshark.org/review/37447 - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - (cherry picked from commit 761985036d3fbb74bb4f17f32bf37a3316be95f4) - Reviewed-on: https://code.wireshark.org/review/37454 - -commit 5ac0ca1588 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jun 4 18:50:27 2020 +0000 - - NSIS: Add styles/translations to uninstallation - - Bug:16601 - Change-Id: I5a1ce4fb373f5eb3a88eedda3395dcb1599fbbe0 - Reviewed-on: https://code.wireshark.org/review/37383 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit c125e306c6bcf6b2b3c56e3b1ec60d553df708bd) - Reviewed-on: https://code.wireshark.org/review/37452 - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - -commit 1da837dee7 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Wed Jun 10 15:54:56 2020 +0200 - - coap: Fix "More Flag" value - - Use the raw value for the block "More Flag", not the already adjusted one. - - Change-Id: I13ddd24c4f9b9201798d18abe008945879f03774 - Reviewed-on: https://code.wireshark.org/review/37442 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - (cherry picked from commit ad248256318eaaea4292453cf042ca4382342f63) - Reviewed-on: https://code.wireshark.org/review/37450 - -commit eec52efee3 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Wed Jun 10 15:52:28 2020 +0200 - - epan: Reassembled in link is generated - - Mark the "Reassembled in" link item as generated. - - Change-Id: Id8f7b26cf77aa5bc82de07799bb1468c8b8a4209 - Reviewed-on: https://code.wireshark.org/review/37441 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit b77a435aee80adbde54cb67ef549c6c948a7cdc9) - Reviewed-on: https://code.wireshark.org/review/37449 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 0682aa90e3 -Author: Roland Knall <rknall@gmail.com> -Date: Wed Jun 10 13:23:58 2020 +0200 - - Qt: Fix zip import/export on Windows - - On Windows, cleaning up the filename inside the zip - failed due to the backslash not properly being recognized. - This lead to profiles, which could not be imported on another - machine, if the filename contained a path not existing there. - - Bug: 16608 - Change-Id: Ib30b2370e30c30ac60f283edf6376c07258c25b6 - Reviewed-on: https://code.wireshark.org/review/37437 - Petri-Dish: Roland Knall <rknall@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Roland Knall <rknall@gmail.com> - (cherry picked from commit 6f700a9da61c38b9b2b492a5ea6810f73e6c66b1) - Reviewed-on: https://code.wireshark.org/review/37439 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit b0a69c1d8b -Author: Pavel Strnad <strnadp@tiscali.cz> -Date: Wed Jun 10 10:27:55 2020 +0200 - - NAS-5GS: fix decoding of 5GSM cause - - 5GSM cause (9.11.4.2) is using TV format - in PDU session modification request messgae - based on 24.501/chapter 8.3.7.1 - - Change-Id: I7e072e2b4c3422ec75e8bcebebb534905028eb2a - Reviewed-on: https://code.wireshark.org/review/37433 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 43c16b14fb7730a09930f8bbf5bf380cc118002e) - Reviewed-on: https://code.wireshark.org/review/37434 - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - -commit d4ed02c032 -Author: Guy Harris <gharris@sonic.net> -Date: Tue Jun 9 15:56:44 2020 -0700 - - assa_r3: don't use proto_tree_add_string() on a non-string field. - - Do as we do elsewhere; use proto_tree_add_none_format(). - - (Should this be done with an expert info?) - - Change-Id: I7f4514b6f4b6687b21c1912292f1153593bf8440 - Reviewed-on: https://code.wireshark.org/review/37416 - Petri-Dish: Guy Harris <gharris@sonic.net> - Tested-by: Petri Dish Buildbot - Reviewed-by: Guy Harris <gharris@sonic.net> - (cherry picked from commit 8df53a177d094978948c7bf86fbc369ac4e2de5f) - Reviewed-on: https://code.wireshark.org/review/37418 - -commit 101eff6d31 -Author: Guy Harris <gharris@sonic.net> -Date: Mon Jun 8 01:23:37 2020 -0700 - - icmp: fix indentation. - - Change-Id: I2a9e4ae098fd3c71cc4bfbf5ee56507933a205b7 - Reviewed-on: https://code.wireshark.org/review/37402 - Reviewed-by: Guy Harris <gharris@sonic.net> - (cherry picked from commit bc21aa158c1394e16c18038b27c72c2996072ab5) - Reviewed-on: https://code.wireshark.org/review/37403 - -commit 048dfa0931 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jun 7 08:32:59 2020 +0000 - - [Automatic update for 2020-06-07] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I7000c639b44180f62f5f8adb7ac7bc337ea6f7f1 - Reviewed-on: https://code.wireshark.org/review/37391 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 100c01583e -Author: Pascal Quantin <pascal@wireshark.org> -Date: Thu Jun 4 17:19:51 2020 +0200 - - GTPv2: the header sequence number is 3 bytes long, display it as FT_UINT24 - - Change-Id: Id47b720a1ac4e11c0d3c4322fc4929e3d6ab8e9d - Reviewed-on: https://code.wireshark.org/review/37379 - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> - (cherry picked from commit 1bab3c4a0f61ef6c1532d57275aaa33c50042636) - Reviewed-on: https://code.wireshark.org/review/37380 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - -commit 4f6ff1fc0d -Author: Pavel Strnad <strnadp@tiscali.cz> -Date: Sat Jun 6 10:34:15 2020 +0200 - - NAS-5GS: fix decoding of SM PDU DN request container - - SM PDU DN request container (9.11.4.15) is using TLV format - in PDU session establishment request message - based on 24.501/chapter 8.3.1.1 - - Change-Id: I9a85b321c051b798a207fdf251a273c1e7a5490e - Reviewed-on: https://code.wireshark.org/review/37386 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - (cherry picked from commit 4ef8c1880d54fdfa676dcea507465deea3fd1d42) - Reviewed-on: https://code.wireshark.org/review/37388 - -commit 35f348308b -Author: Pau Espin Pedrol <pespin@sysmocom.de> -Date: Tue Jun 2 17:08:08 2020 +0200 - - GSM RR: Fix wrong expert warning about missing P1 Rest Octets - - 3GPP TS 04.08 sec 9.1.22 "Paging request type 1" states that "P1 Rest - Octets" is (M)andatory, but then in the same table states its length - ranges from 0 to 17, which means it can actually be missing on some - cases: - "The sum of the length of this IE and the L2 Pseudo Length of the - message equals 22." - - So that happens (l2 plen = 22) for instance when 2 IMSIs are provided in - a Paging Request Type 1 message. In that case, we shouldn't be warning - about the packet being malformed having the IE missing, since it's - actually expected. - - The l2 Pseudo Length is shifter 2 bits because that's how it's defined - in the spec (sec 10.5.2.19). - - Change-Id: I3dcb1d23c7d6fd2f1e370462481086516f24c7bb - Reviewed-on: https://code.wireshark.org/review/37361 - Reviewed-by: Vadim Yanitskiy <axilirator@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Harald Welte <laforge@gnumonks.org> - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - (cherry picked from commit 469b0b2765ccfb63be1eb1bb3219d0d831094884) - Reviewed-on: https://code.wireshark.org/review/37363 - -commit f0d1192271 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun May 31 08:25:36 2020 -0700 - - Qt: Fix some Qt 5.15 deprecation warnings. - - Use Qt::ItemFlags() instead of 0. - - Use QFileDialog::Options() instead of 0. - - Use QComboBox::textActivated instead of QComboBox::activated. - - Switch to just using Qt::WindowFlags() in GeometryStateDialog. This - *should* work for Qt 5.5 and earlier, but if it doesn't we can switch - back. - - Change-Id: Iaf4e7efa1a11fc7f3325b449eef1be308cd21b45 - Reviewed-on: https://code.wireshark.org/review/37349 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 2ca5a145136e21ecef7e432d4bb50cca3476b06f) - Reviewed-on: https://code.wireshark.org/review/37355 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit a7c9286b8b -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu May 28 11:40:08 2020 -0700 - - Qt: Updates for 5.15. - - Fix the following deprecation issues for Qt 5.15: - - Use Qt::WindowFlags() instead of 0 in Qt >= 5.6. - - Pass Qt::SkipEmptyParts instead of QString::SkipEmptyParts to QString::split() in Qt >= 5.15. - - Use QMultiMap instead of QMap where we were using QMap::uniqeKeys(). - - Use QCP::Interactions() instead of 0. - - Use '\n' instead of QTextStream::endl. - - Use QWheelEvent::angleDelta() instead of QWheelEvent::angle(). - - Change-Id: Ie2d69d3a396c0821c2c34f506ddad6f8e22f7049 - Reviewed-on: https://code.wireshark.org/review/37334 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman <a.broman58@gmail.com> - (cherry picked from commit 76d92ba7e76ef0714090770ff1ee79861716388c) - Reviewed-on: https://code.wireshark.org/review/37354 - -commit e34e3f248f -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun May 31 08:32:00 2020 +0000 - - [Automatic update for 2020-05-31] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I3dd71a24a0b4ed37b89beb8ab46b40c2e5b7bce7 - Reviewed-on: https://code.wireshark.org/review/37340 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit b5d6f930d6 -Author: Pascal Quantin <pascal@wireshark.org> -Date: Wed May 27 18:16:31 2020 +0200 - - NAS 5GS: do not stop dissection if the messages are integrity protected only - - We should explicitly check that the security header indicates the use of - ciphering. - - Change-Id: I0e6f50e180f95e03d6e1dd96db39a03543490be4 - Reviewed-on: https://code.wireshark.org/review/37326 - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - (cherry picked from commit 64d99d66629eb595f93994758b44b21410caae45) - Reviewed-on: https://code.wireshark.org/review/37327 - -commit 85ba79f40d -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun May 24 08:31:01 2020 +0000 - - [Automatic update for 2020-05-24] - - Update manuf, services enterprise numbers, translations, and other items. - - Change-Id: I2d059a2d1e37748de506eeb096d85cf4184757e7 - Reviewed-on: https://code.wireshark.org/review/37294 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 95a7caecb1 -Author: Pascal Quantin <pascal@wireshark.org> -Date: Fri May 22 15:57:51 2020 +0200 - - Windows: upgrade USBPcap to 1.5.4.0 - - Change-Id: I1414b2f0550a8e498fbf8d688119ffc42837c0ee - Reviewed-on: https://code.wireshark.org/review/37281 - Petri-Dish: Pascal Quantin <pascal@wireshark.org> - Tested-by: Petri Dish Buildbot - Reviewed-by: Tomasz Moń <desowin@gmail.com> - Reviewed-by: Pascal Quantin <pascal@wireshark.org> - (cherry picked from commit f94fed601098aaa93cfd1c49574a3ac37e006c7a) - Reviewed-on: https://code.wireshark.org/review/37284 - -commit 0f2bd10a89 -Author: Guy Harris <gharris@sonic.net> -Date: Wed May 20 04:17:06 2020 -0700 - - peekremote: go to the Wayback Machine for a URL. - - That URL is now dead - Wildpackets is now (part of) LiveAction. - - Change-Id: I2dea461fa6e97034d9070cef397038bf606de98b - Reviewed-on: https://code.wireshark.org/review/37263 - Reviewed-by: Guy Harris <gharris@sonic.net> - (cherry picked from commit 6bc019e2724e44d53f26d6bf564abc518946d821) - Reviewed-on: https://code.wireshark.org/review/37264 - -commit 7b7fe7489a -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue May 19 13:31:11 2020 -0700 - - 3.2.4 → 3.2.5. - - Change-Id: Ib36b7d59392b08d84be0a4dca06d9b6d2cd9088d - Reviewed-on: https://code.wireshark.org/review/37258 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 068df48681 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue May 19 10:42:17 2020 -0700 - - Add missing release notes content. - - Change-Id: Idb72f56fe0b436852eb45f14e958c151613044d5 - Reviewed-on: https://code.wireshark.org/review/37253 - Reviewed-by: Gerald Combs <gerald@wireshark.org> diff --git a/debian/changelog b/debian/changelog index febb78cf18..ecdfb1bc06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wireshark (3.2.5) unstable; urgency=low +wireshark (3.2.6) unstable; urgency=low * Self-made package diff --git a/docbook/attributes.adoc b/docbook/attributes.adoc index 0f5240c9d0..a6406d8fd6 100644 --- a/docbook/attributes.adoc +++ b/docbook/attributes.adoc @@ -1,6 +1,6 @@ // Common attributes -:wireshark-version: 3.2.5 +:wireshark-version: 3.2.6 // Required for btn, kbd:, and menu: macros. :experimental: diff --git a/docbook/release-notes.adoc b/docbook/release-notes.adoc index d189df2522..3e403f0582 100644 --- a/docbook/release-notes.adoc +++ b/docbook/release-notes.adoc @@ -14,24 +14,24 @@ It is used for troubleshooting, analysis, development and education. == What’s New -The Windows installers now ship with Npcap 0.9994. -They previously shipped with Npcap 0.9991. +// The Windows installers now ship with Npcap 0.9994. +// They previously shipped with Npcap 0.9991. -The Windows installers now ship with USBPcap 1.5.4.0. -They previously shipped with USBPcap 1.5.3.0. +// The Windows installers now ship with USBPcap 1.5.4.0. +// They previously shipped with USBPcap 1.5.3.0. === Bug Fixes The following vulnerabilities have been fixed: -* wssalink:2020-09[] -GVCP dissector infinite loop. -wsbuglink:16029[]. -cveidlink:2020-15466[]. -// Fixed in master: d70bd4489f -// Fixed in master-3.2: 11f40896b6 -// Fixed in master-3.0: n/a -// Fixed in master-2.6: n/a +// * wssalink:2020-10[] +// Foo dissector {crash,infinite loop}. +// wsbuglink:xxxx[]. +// cveidlink:2020-xxxx[]. +// Fixed in master: xxxx +// Fixed in master-3.2: xxxx +// Fixed in master-3.0: xxxx +// Fixed in master-2.6: xxxx The following bugs have been fixed: @@ -41,24 +41,6 @@ The following bugs have been fixed: //* Wireshark is solely responsible for the decline of shopping malls in your area. // cp /dev/null /tmp/buglist.txt ; for bugnumber in `git log --stat v3.2.6rc0..| grep ' Bug:' | awk '{print $2}' | sort -n -u ` ; do "$(git rev-parse --show-toplevel)/tools/gen-bugnote" $bugnumber; pbpaste >> /tmp/buglist.txt; done -* Add decryption support for QUIC IETF version 0xfaceb001 and 0xfaceb002. wsbuglink:16378[]. - -* Windows Uninstall does not remove all files in Program Files. wsbuglink:16601[]. - -* The "relative sequence number" is same as "raw sequence number" when tcp.analyze_sequence_numbers:FALSE. wsbuglink:16604[]. - -* Importing profiles from a different Windows PC fails. wsbuglink:16608[]. - -* Decode as not working correctly with multiple user profiles. wsbuglink:16635[]. - -* Wireshark can misdissect the HE Radiotap field if it's ever dissected one with any value unknown. wsbuglink:16636[]. - -* Buildbot crash output: fuzz-2020-06-19-5981.pcap. wsbuglink:16639[]. - -* Buildbot crash output: fuzz-2020-06-20-7665.pcap. wsbuglink:16642[]. - -* mergecap man page contains invalid formatting. wsbuglink:16652[]. - === New and Updated Features There are no new features in this release. @@ -82,19 +64,6 @@ There are no new protocols in this release. // Add one protocol per line between the -- delimiters. [commaize] -- -ASTERIX -CoAP -GSM RR -GTPv2 -GVCP -LTE RRC -NAS-5GS -NGAP -QUIC -R3 -Radiotap -RTPS -TCP -- === New and Updated Capture File Support diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index ccebcd4376..be711d2b1e 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -329,7 +329,7 @@ endif() set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL" LINK_FLAGS "${WS_LINK_FLAGS}" - VERSION "13.0.5" SOVERSION 13 + VERSION "13.0.6" SOVERSION 13 INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}" # By default the name for a library with target name epan will be libepan, # but Ethereal is now named Wireshark diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt index ddeeb7f6c3..840b1a0a94 100644 --- a/wiretap/CMakeLists.txt +++ b/wiretap/CMakeLists.txt @@ -122,7 +122,7 @@ set_target_properties(wiretap PROPERTIES PREFIX "lib" COMPILE_DEFINITIONS "WS_BUILD_DLL" LINK_FLAGS "${WS_LINK_FLAGS}" - VERSION "10.0.5" SOVERSION 10 + VERSION "10.0.6" SOVERSION 10 FOLDER "DLLs" INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}" ) |