aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-11-30RRC: reset strbuf pointer after its usePascal Quantin2-45/+114
While we are at it, let's add a partial dissection of PLMN-IdentityWithOptionalMCC-r6 IE. Bug: 14248 Change-Id: I20b76bc74c248914db21629f8ce77799fccb1612 Reviewed-on: https://code.wireshark.org/review/24661 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-30http2: select fields from Decompressed header tab when possiblePeter Wu1-14/+18
The "Decompressed header" tab contains some human-readable text, but no field was associated with it. Instead, the fields were attached to raw compressed headers which, all with the same offset and length. Ensure that each byte in the decompressed header tab is accounted for. The only fields that are still pointing to the raw compressed buffer is the http2.header field (covering a full raw header), the representation type (a few bits, at most 1 octet) and the index length (guessed length, an exact value is probably not worth the cpu cycles). Change-Id: Ic0118e9ed583841a2d353f8b8c28dcafea3401f2 Reviewed-on: https://code.wireshark.org/review/24660 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-30Qt: fix crash when selecting field with composite dataPeter Wu1-1/+1
The HTTP2 decompressed headers tab is composed from multiple TVBs, these have a null "real_data" pointer. Do not access it directly but use an accessor which Does The Right Thing™. Change-Id: Ib974fed9782d60aa2b91e3e712ba737000b79b4b Fixes: v2.5.0rc0-1627-g8a6ea0e454 ("Qt: Further cleanup ByteView") Reviewed-on: https://code.wireshark.org/review/24658 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexander Gryanko <xpahos@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-11-30CIP Safety: base packet length can be usedMichael Mann1-1/+1
Slight adjustment to I394fa91a5cfa1700fb12441d4884c0367b39df8b Change-Id: Id097a39265f49a79f3d39855ef6b5c95ffe8c4f1 Reviewed-on: https://code.wireshark.org/review/24654 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30RTPS: Added link to the DCPSPublicationData frame numberJuanjo Martin1-7/+18
Added a link inside the Topic Information feature so users can quickly go to the discovery data associated with the writer sending this submessage. Change-Id: I3a89630a275e5d857e8bbf86dc5171c9f0921d5b Reviewed-on: https://code.wireshark.org/review/24646 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30RTPS: Added new endpoints for the Security specJuanjo Martin2-40/+51
Change-Id: Ia827c43b161a2b64804b0eac220b428eb853d255 Reviewed-on: https://code.wireshark.org/review/24647 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30RRC: Fixup wmem_strbuf usage.Gerald Combs2-35/+39
Instead of calling wmem_strbuf_finalize, which frees the strbuf structure and makes it unsuitable for reuse, call wmem_strdup + wmem_strbuf_truncate. This fixes a heap-use-after-free. Bug: 14248 Change-Id: I498e10ed9f9afa7fa72b607eb43f68c710de777e Reviewed-on: https://code.wireshark.org/review/24650 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30Reformat some top-level ui files.Gerald Combs16-4408/+4215
Make sure each ui/*.[ch] file uses identical (4-space) indentation. Remove ui/.editorconfig. Fix up other formatting where needed. SPDX-abbreviate the license blurb in the files we modify. Change-Id: I5faa1c1eae9a4b6220422ad8e4ba7a341c7deb1f Reviewed-on: https://code.wireshark.org/review/24632 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-30NetBIOS: Don't write past the beginning of a buffer.Gerald Combs1-1/+2
Make sure process_netbios_name doesn't write past the beginning of its buffer. Bug: 14249 Change-Id: Idb294ba2362e48b879bc4c0c0ddaf64fcf1b5d72 Reviewed-on: https://code.wireshark.org/review/24651 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-29LTE L2 protocols: add FT_FRAMENUM_TYPE for most FT_FRAMENUM fields.Martin Mathieson5-13/+47
Missed out some that would probably result in too many links. Added FT_FRAMENUM_RETRANS_PREV and FT_FRAMENUM_RETRANS_NEXT to enum, these display as arrows like REQUEST and RESPONSE do. Change-Id: I6e8d222955f2ba59a713e8a389837b55a1c7f262 Reviewed-on: https://code.wireshark.org/review/24600 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-11-29Update .gitignoreJoão Valverde1-6/+2
Change-Id: I3b5f343f241a7d0571ddd7a0647c45c2bef28c73 Reviewed-on: https://code.wireshark.org/review/24648 Reviewed-by: João Valverde <j@v6e.pt>
2017-11-29[L2TP] Enhance info col layout.AndersBroman1-6/+7
Change-Id: Ib16b71b47f97516db55412f1881d995706e723b1 Reviewed-on: https://code.wireshark.org/review/24645 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29cmake: fix build with cmake 2.8.11.2Peter Wu1-3/+4
"file(GENERATE ...)" is only supported since 2.8.12, since the list of sources is fixed at cmake time, just use "file(WRITE ...)". Change-Id: If4a547803ab536cf8d131045692d3e58301b0cd2 Fixes: v2.5.0rc0-1763-gfe0c2b0485 ("Rewrite make-dissector-reg.py in C") Reviewed-on: https://code.wireshark.org/review/24638 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29[packer-ehdlc.c] Mark some fields as generated, enhance info col.AndersBroman1-3/+10
Change-Id: I10241389dbd3c463b36c5dfcd7a4fa929a1bbf6a Reviewed-on: https://code.wireshark.org/review/24644 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29autotools: remove unnecessary include directory for epanPeter Wu1-1/+1
Since v2.1.0rc0-2202-g6b54fbf3bf, wslua is also not necessary in the include path, so remove that too. Change-Id: Ib227b71b08da9fc397d6618b60100ab819570b86 Reviewed-on: https://code.wireshark.org/review/24640 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-29cmake: match include directories with autotoolsPeter Wu4-2/+4
Match closer the behavior of autotools which does not include epan in its include paths by default. Change-Id: I885bc7942490a5674c6ac75f9a8ea221555e3784 Reviewed-on: https://code.wireshark.org/review/24639 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-29make-dissectors: Use g_file_set_contents()João Valverde1-25/+39
Also add some more errors checks, we only pass valid files to make-dissectors. Change-Id: I9c068e47f35ee6c3da0112ee9ce905af35030475 Reviewed-on: https://code.wireshark.org/review/24625 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29RTPS: Added DataWriter QoS to topic information featureJuanjo Martin2-12/+58
Change-Id: Ib8d9c4f75543ed05c1bf69589069ed2425e3394e Reviewed-on: https://code.wireshark.org/review/24555 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29RTPS: Added locator and product version to Micro DDSJuanjo Martin2-17/+29
Change-Id: Icfb1c505865f5a32152cc056173baae8f7d01f36 Reviewed-on: https://code.wireshark.org/review/24603 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29Threads: Set lifetimes and add a compatibility routine.Gerald Combs5-30/+20
Join the protocol registration threads so that they call g_thread_unref which in turn detaches/terminates the thread. This gets rid of many TSan and DRD errors here. The remaining ones appear to be false positives. Add g_thread_new to glib-compat (untested). Change-Id: I4beb6746ed08656715cf7870ac63ff80cf1ef871 Reviewed-on: https://code.wireshark.org/review/24619 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>
2017-11-29CIP Safety: check packet length before dissectingPascal Quantin1-0/+5
Otherwise we can call CRC functions with a negative value, leading to a segmentation fault. Bug: 14250 Change-Id: I394fa91a5cfa1700fb12441d4884c0367b39df8b Reviewed-on: https://code.wireshark.org/review/24621 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-29Qt: fix role check in AStringListListUrlProxyModel::dataPeter Wu1-2/+2
Change-Id: I7c683449155f7dcb63731e6575cf92c30be78934 Fixes: v2.5.0rc0-1841-gd865871627 ("Qt: About Dialog move to QTreeView and fix copy") Reviewed-on: https://code.wireshark.org/review/24637 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-29Normalize ui/win32 indentation and switch to SPDX.Gerald Combs8-226/+144
Switch ui/win32/console_win32.[ch] to 4-space indentation to match the other files in that directory. Remove ui/.editorconfig. SPDX-abbreviate the license blurb in all files in that directory. Change-Id: I68aa5a3ae7ae184ea8d27d9dba06b968ac3d2472 Reviewed-on: https://code.wireshark.org/review/24636 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-29Get rid of --with-pcap-remote; always check for pcap_open.Guy Harris2-37/+1
No need to make it an option; it's not an option in CMake. Change-Id: I43dd25b9b73e6f372bd6612aea6372b950b0ca74 Reviewed-on: https://code.wireshark.org/review/24635 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-29Use a separate Boolean to indicate whether we have a duration.Guy Harris1-3/+10
Reserved values are a bit of a hack. (If this were Swift....) Change-Id: I243e8f497345f44d94af6106287556b8831fba92 Reviewed-on: https://code.wireshark.org/review/24633 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-28Report the actual *error* for CANT_GET_INTERFACE_LIST.Guy Harris1-4/+9
CANT_GET_INTERFACE_LIST does *NOT* mean "No remote interfaces found.", as in "there are no remote interfaces"; a NULL return from get_remote_interface_list() and an err value of 0 means that. CANT_GET_INTERFACE_LIST means "something bad happened and the error string says what it is". Display that error string, so when people report problems: https://github.com/the-tcpdump-group/libpcap/issues/666 they'll give the actual error message, and I'll fix my breakage of the rpcap protocol negotiation: https://github.com/the-tcpdump-group/libpcap/commit/2972769d03dd60d4bce233a12d77a3464f0d9dc4 rather than just wondering what the problem was and asking the reporter of the problem for more information. Report anything other than "there are no remote interfaces" as an error, not a warning. Change-Id: Ia9381953d080e037254f21e47ee7ecc4619b7254 Reviewed-on: https://code.wireshark.org/review/24627 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-28Gen-bugnote: Replace backslashes with {backslash}.Gerald Combs1-1/+2
Change-Id: I12b479fedf9ca54b600919a4586c4b4c43464589 Reviewed-on: https://code.wireshark.org/review/24626 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-28Qt: Small layout improvement in preferencesStig Bjørlykke2-17/+21
Make PacketList settings look like the StatusBar settings. Remove unneeded QVBoxLayout. Change-Id: Id1910b2cf4cc5d3ab52d2abd781045ad4033469a Reviewed-on: https://code.wireshark.org/review/24618 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-28ZigBee: Add remaining attributes from Smart Energy Metering clusterKenneth Soerensen1-3/+731
Change-Id: I7ca67ceaf72a1e4cc1c7b3ccc8fed79fafefe575 Reviewed-on: https://code.wireshark.org/review/24614 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-28Qt: Add support for DCE/RPC in Decode AsMichael Mann2-4/+59
DCE/RPC is a FT_GUID type, but has some special handling. "Regular" FT_GUID dissector tables still not supported. Bug: 13122 Change-Id: I328776ffe5bbe87ecfbe6719f04d18b1b237a583 Reviewed-on: https://code.wireshark.org/review/24602 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-28ui: Sort profile namesStig Bjørlykke1-3/+19
Not all file systems returns a sorted list of filenames, so we need to sort the entries before using the list in the Profile popup and the Manage Profiles dialog. Change-Id: Ic1f2bfa77fb47fb8c406d891aee49b484876b4f7 Reviewed-on: https://code.wireshark.org/review/24615 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-28gitignore: Add packaging/macosx/PkgInfoStig Bjørlykke1-0/+1
Change-Id: I630fa8ae0c3d5f078922b4d6cb2ee064c31bd35e Reviewed-on: https://code.wireshark.org/review/24616 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-11-27make-plugin-reg: Update modification time to plugin.cJoão Valverde1-25/+3
Let the build system handle the dependencies. Make sure to update the file even if nothing has changed to avoid re-running the script every time. Change-Id: I2229c13578a6278a04152825c98d8b889081dcb7 Reviewed-on: https://code.wireshark.org/review/24597 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot Reviewed-by: João Valverde <j@v6e.pt>
2017-11-26Qt: About Dialog move to QTreeView and fix copyRoland Knall7-235/+277
- Fix an issue, where the url was opened twice on Linux - Make the filter case insensitive if so wished for - Allow the copy to either copy the selected column (just Copy) or copy the complete row, with tab separation - Move to QTreeView instead to make it similar to the rest of the tables Change-Id: Ie6064f2ad2014e24546553c5febe63358e2f69ec Reviewed-on: https://code.wireshark.org/review/24570 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Jim Young <jim.young.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-26TLS13: update for draft -22 (Server Hello, HRR, CCS, NST)Peter Wu4-30/+129
Draft -22 moved the server version to an extension and makes HRR look like a SH. SH is now interpreted as TLS 1.2. Detecting TLS 1.3/HRR requires scanning SH extensions before parsing the message, so do that. Changes: - Add draft 22 version identifier. - Recognize special Server Hello magic for HRR. - Dissect SupportedVersions for SH/HRR, rename the field to match spec. - Recognise new Server Hello format (including legacy fields). - Move version detection up to handshake message dissection to allow HRR (disguised as SH) to be detected as such. DTLS does not have HRR and fragmentation makes it harder, so use its version as usual. - Ignore ChangeCipherSpec again for draft 22 (do not add expert info). - Allow NST ticket_nonce to be empty. Change-Id: I9d5f7dba173e1b5c901bf9a6917c65520ee60a2f Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/24340 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-26*Always* set pinfo->p2p_dir from the wtap_pkthdr.Guy Harris1-6/+14
Don't just do it if we're actually creating protocol tree information for the "Frame" protocol; that information is used even when we're *not* creating protocol tree information for "Frame". Bug: 14245 Change-Id: Ie3754e15754fb6a73529e20d8fa68956e206a994 Reviewed-on: https://code.wireshark.org/review/24593 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-26NBAP: Always map NB-CC to CRNC-CCPeter Hamilton3-119/+81
Now maps for all channels and not only E-DCH Change-Id: I51099e887830e5142b58fd624775d395e354b012 Reviewed-on: https://code.wireshark.org/review/24572 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-26Bugfix DCE/RPC Decode As for GTK.Michael Mann1-2/+4
An attempt at optimization broke GTK DCE/RPC Decode As because DCE/RPC dissector tables aren't FT_UINT type. The "optimization" was trying to retrieve dissector handle from FT_UINT typed dissector table. Move retrieval of dissector handle to under FT_UINT check Change-Id: Id81cd79db60263155392aaac0c796a6484ef7504 Reviewed-on: https://code.wireshark.org/review/24589 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-26[Automatic update for 2017-11-26]Gerald Combs11-33/+712
Update manuf, services enterprise numbers, translations, and other items. Change-Id: I2963633f86a87209eca574db52663ebbe732f9d9 Reviewed-on: https://code.wireshark.org/review/24590 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-11-26artnet: Fix ArtPollReply spare/style field orderErwin Rol1-4/+4
In the ArtPollReply the field order of the style and 3 spare bytes was wrong, according artnet spec 1.4 page 25 the order should be spare, spare, spare, style. Change-Id: I5683e5a8e97643a7bb1962178178c175d485098c Signed-off-by: Erwin Rol <erwin@erwinrol.com> Reviewed-on: https://code.wireshark.org/review/24584 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-25Add information about pre-commit script to Developer Guide.Michael Mann1-5/+19
Bug: 9553 Change-Id: I19505c3c05585a05877e9f0db06400ebb8b33985 Reviewed-on: https://code.wireshark.org/review/24585 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-11-25LTE MAC stats: make display filter field workMartin Mathieson2-1/+14
Change-Id: I76b97f4f67ba63f7479dffc1cf1267b39cefa4fa Reviewed-on: https://code.wireshark.org/review/24582 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-11-25Qt: AccordionFrame users keyPressEvent() fixesStig Bjørlykke7-11/+17
- Declare keyPressEvent() virtual. - Give keyPressEvent() to parent when done. Change-Id: If1c05e86a5ab71dd239c025cdb2bcfb1ef484811 Reviewed-on: https://code.wireshark.org/review/24573 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-25LTE RLC Stats: make display filter field work.Martin Mathieson2-1/+15
Change-Id: Ic3c9ebb176bcc7c3973aca382c270aacac7283af TODO: the same for LTE MAC Stats.. Reviewed-on: https://code.wireshark.org/review/24577 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-25RLC LTE stats: show UE and channel bw properlyMartin Mathieson1-7/+10
Change-Id: I49edf405d61b15ba451f291c32b8fc3126a7e9d7 Reviewed-on: https://code.wireshark.org/review/24575 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-25packet-iwarp-mpa.c: Stop FPDU dissection if the ULPDU_LENGTH field does NOT ↵Michael Mann1-6/+3
contain what is expected Bug: 14236 Change-Id: I15f1bc70978d1e5ae3b4bba1ff87b590726cfaa1 Reviewed-on: https://code.wireshark.org/review/24578 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-24Re-sync with osmocom version of the file with new typesMartin Heusse1-0/+4
Change-Id: Iae231de172eabe135ca3acd7f82b1683eebaee38 Reviewed-on: https://code.wireshark.org/review/24574 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-11-24Qt: About - implement copy&paste and urlsRoland Knall3-3/+100
Make the URLs clickable again, and allow the copy/paste of selected entries via context menu Change-Id: I619059ca77c54314df31364de8ee7fce9dbc3ed3 Reviewed-on: https://code.wireshark.org/review/24569 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2017-11-24TDS: Fix packet reassembly for TDS 4.x/TDS5.x streams.Craig Jackson1-28/+87
The existing TDS "netlib" packet reassembly code only handles situations where the netlib header has a valid non-zero packet number. This does not always occur for older clients, in particular when TDS 7 is not in use. This has been tested with: DB-Library 4.6 talking to Sybase CT-Library 5.0 talking to Sybase jConnect 5.0 talking to Sybase .NET 4.5 talking to SQL Server with TLS login Freetds CT-Library talking to SQL Server with unencrypted login - I'm not sure of the version of this, in the protocol it appears as 8.0.341. Change-Id: I1690ba191ba3f4bd10569ab1a26dae82c5bbf260 Reviewed-on: https://code.wireshark.org/review/24470 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-11-24DTLS: fix decryption with EMS and client authPeter Wu1-16/+22
Similar to the TLS fix in v2.5.0rc0-1805-gd790c524b4, ensure that the correct master secret is calculated when extended_master_secret is enabled with client auth and a decrypted RSA premaster secret. Bug: 14243 Change-Id: I3d8cecef0f0cc3ec73537053489adc2d0d45c947 Reviewed-on: https://code.wireshark.org/review/24564 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>