Commit graph

89041 commits

Author SHA1 Message Date
Frans Meulenbroeks
49b75e003f BTatt: fix indentation of two dissectors
The indentation of the output of the fields in the dissectors for
body composition measurement and weight measurement should be at the
top level, not a child the Timestamp node.

Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@yahoo.com>
2023-10-09 15:01:14 +00:00
John Thacker
b69cd1333c SSH: Set up channel pairings properly
The channel numbers are not necessarily the same on either side.
Process the SSH_MSG_CHANNEL_OPEN_CONFIRMATION to set up channel
pairings. Previously it was creating a channel pairing when
a subdissector was set but always using channel 0 for both sides.

The message that sets the channel mapping (CONFIRMATION) is from the
opposite side from messages that configure the channel (CHANNEL_OPEN,
CHANNEL_REQUEST), so try to handle this.

We can set a subdissector to one side even if we don't get the
above message (a one sided capture?)

Change a few unsigned ints to uint32_t (as specified in RFC 4254),
and ensure that strings are retrieved in UTF-8 (per RFC 4254).

Note that we still don't handle closed and reassigned channel numbers
for random packet access, which requires something like a multimap
instead of maps.

Related to #16054
2023-10-09 11:23:12 +00:00
Dr. Lars Völker
f2d2384876 BLF: create Ethernet Interface IDs based on channel and hwchannel
Ethernet (ext) is a bit different as it has not only a channel but also
a hwchannel, which seems to be the port of a multiport interface.

This patch takes this into account by creating interfaces like ETH-1-1.

This is one part of the solution for issue #19380
2023-10-09 06:55:13 +00:00
João Valverde
b3f8d12795 ftypes: Use 64-bit integers only internally
Remove code duplication for 32-bit and 64-bit integers.

Use 64-bit for everything and cast to 32-bit to implement
getters for 32-bit numbers.
2023-10-09 06:08:34 +00:00
João Valverde
64bba16c80 dftest: Show types with -d 2023-10-08 21:55:40 +01:00
João Valverde
c22dd98eae Qt: Remove a separator from the Help menu
This separator does not split any distinct category that I can
discern and looks out-of-place.
2023-10-08 20:52:59 +00:00
Pascal Quantin
f8b0e232af Windows: upgrade Npcap to 1.77 2023-10-08 19:34:16 +02:00
Gerald Combs
433e4f3f72 [Automatic update for 2023-10-08]
Update manuf, services enterprise numbers, translations, and other items.
2023-10-08 16:25:11 +00:00
John Thacker
ae3b2033e4 sctp tap: Fix copying checksum string
In [g_]strlcpy, the dest_size parameter is the buffer size, not the
number of bytes to copy. Fix truncating the last byte of the string
of the checksum type when copying. This affects display in the
SCTP association dialogs, etc.
2023-10-08 14:53:12 +00:00
John Thacker
eb5516d1d3 ssh: Enable DH Group Exchange
Fix a bug in handling Diffie Hellman Group Exchange and enabled
it.

Taken from MR !6352

Related to #16054
2023-10-08 13:10:10 +00:00
Jaap Keuter
50a4840696 Qt: Normalize SCTP dialogs 2023-10-08 12:30:26 +00:00
Dr. Lars Völker
0bed6790c3 BLF: Fix Ethernet Status Filter
Fixes: #19381
2023-10-08 11:43:20 +00:00
Gerald Combs
61f77a175a Tools: Have update-appdata.py print release information 2023-10-07 17:57:23 -07:00
Martin Kaiser
310668173c mdb: dissect comms gw config
Dissect the communications gateway's config message.
2023-10-07 12:39:09 +00:00
Vasil Velichkov
33ed814669 diameter: Decode User-Name as an IMSI in S13/S13' 2023-10-07 09:44:23 +00:00
Gerald Combs
82084f606f Packaging: Make sure we stash our version info when creating a tarball 2023-10-06 15:30:03 -07:00
Gerald Combs
5a2d1f11ca Tools: More update-appdata.py updates
We don't need to fetch the most recent wireshark-* tag (which might not
exist).
2023-10-06 14:30:50 -07:00
Gerald Combs
36fb1a1122 Doc: Fix the include path in the release notes
Update a note about the asciidoctor's --failure-level flag.
2023-10-06 21:09:33 +00:00
Gerald Combs
d0bc4c6505 Tools: Fix a comment in update-appdata.py
[skip ci]
2023-10-06 13:51:24 -07:00
Gerald Combs
8962b0c46b GitLab CI: Update our Freedesktop metainformation when we build our tarball
Fixes #19382
2023-10-06 20:44:23 +00:00
Martin Kaiser
32cef085d2 mdb: dissect comms gw's setup command
Dissect the setup command that a vmc sends to a communications gateway.
2023-10-06 15:38:56 +02:00
Martin Kaiser
a8a8e5b878 dect-nwk: use proto_tree_add_item for bcd fields
Now that we can set the endianness for ENC_BCD_DIGITS_0_9 header fields,
we can use proto_tree_add_item for the portable identity fields instead
of fetching the bcd string and adding it manually.
2023-10-06 13:05:43 +00:00
Martin Kaiser
146333ca22 tvbuff: (trivial) fix indentation
Fix the indentation in validate_single_byte_ascii_encoding.
ENC_DECT_STANDARD_4BITS_TBCD is not treated differently from other
encodings.
2023-10-06 13:05:02 +00:00
WFA-achuang
80dded9664 ieee80211: Update the naming of display filter in EHT multi-link fields 2023-10-06 13:04:20 +00:00
Martin Kaiser
6c069829b1 mdb: show comms gw responses
Add a value string for Communications Gateway responses and display them
in the info column.
2023-10-06 12:59:50 +00:00
John Thacker
027cbbf247 ssh: Fix Coverity CID 1504410
Check the return value of gcry_md_setkey, which may fail.

Taken from one of the commits in !6352
2023-10-06 06:58:31 -04:00
John Thacker
2dacfaff0b SSH: Only try to decrypt packets on the first pass
Only try to decrypt packets on the first pass. Avoid creating
file scoped memory for packets that fail decryption. Retrieve
the decrypted message on the second pass, and if decryption
failed, dissect the packet as encrypted instead of showing
lots of malformed packets (especially as this can currently happen
with a known cipher but no keys or DSB.)

Set the sequence number items as generated.

Related to #16054
2023-10-06 00:49:31 +00:00
Martin Mathieson
bce8c7f287 DCT2000: when dissecting mac-nr frame, fill in sfn/sf into struct 2023-10-05 20:21:36 +01:00
Martin Kaiser
84da1d805d mdb: start Communications Gateway support
Start dissecting the requests and responses of the Communications Gatway
peripheral.

We use the complete address + command byte to identify a command. This
is different from the Cashless peripherals, where we use only the command
bits.
2023-10-05 14:35:49 +00:00
John Thacker
f3faac2753 ssh: Plug leak of MAC context when using ChaCha20 2023-10-05 13:29:07 +00:00
hidd3ncod3s Sec
6d14da97ca DCERPC: Add dissector for IWbemLoginClientIDEx(9f6c78ef-fce5-42fa-abea-3e7df91921dc) Interface 2023-10-05 13:28:56 +00:00
Martin Kaiser
c2d223d0e3 mdb: dissect vending messages
Dissect MDB messages related to the actual vending operation.

Make the header fields 32bit long in preparation for Expanded Currency
Mode, but don't dissect the longer version of the messages for now.
2023-10-05 12:40:32 +00:00
David Perry
8d6e559bba [#19371] file-pcapng: check SHB endianness sooner
When dissecting a pcapng file (MIME Files Format) and parsing a SHB,
check its endianness before using its length field to mark bytes for
that block. Prevents the dissector from marking more bytes for a block
than actually belong to that block, in the specific case where a file
contains a second SHB of different endianness than that of the first
SHB.
2023-10-05 11:58:53 +00:00
Martin Mathieson
09ba1a1409 MAC-NR: Add UL CE Timing Advance Report 2023-10-05 11:13:36 +00:00
John Thacker
348c9991f9 ssh: Fix some invalid reads and writes, infinite loops
Eliminate a few cases where tvb_get_ptr() is used with a certain
length, but then the pointer can be accessed beyond that length,
such as when an entire block is not present, or the SSH message
length is (incorrectly) not a multiple of the block length.

Don't return the offset on failure; return the entire tvb. The
offset isn't incremented in that function, and returning the
starting offset causes an infinite loop in dissect_ssh.

For AES CBC we do *not* want GCRY_CIPHER_CBC_CTS (cipher text stealing)
mode, which makes it impossible to use gcrypt on multiple blocks at
a time.

Fix #19369
2023-10-04 21:16:57 -04:00
John Thacker
b09ce5c762 ssh: Don't close a cipher twice
Since we always close the gcrypt cipher contexts when destroying
the file scoped data (07448c57b3), don't
close it on error. (Unless we were to remove the wmem callback.)
2023-10-04 20:54:01 -04:00
Anders Broman
cfe780dd03 asn2wrs: Ignore the "WITH SUCCESSORS" directive
As we do not check the version of the module the dirtective is
meaningless in our case.
ping #19368
2023-10-04 10:53:57 +00:00
Martin Kaiser
5028f7d725 mdb: start dissecting Optional Feature Enabled
Start dissecting the Optional Feature Enabled message from VMC to a
cashless peripheral.
2023-10-04 05:27:23 +00:00
John Thacker
5b3e32acb5 regex: Accept a subj_offset in ws_regex_matches_pos
As the PCRE2 documentation notes, "Setting startoffset differs from passing
over a shortened string and setting PCRE2_NOTBOL in the case of a pattern
that begins with any kind of lookbehind."

For the purposes of finding regex matches starting at a particular
offset in the packet bytes, we will need to handle that properly.
2023-10-03 23:36:03 +00:00
John Thacker
4c05d067f3 Windows packaging: Close a tag
Close a Component tag in the xml

Fixup 15d3e3ff68
2023-10-03 17:54:22 -04:00
Gerald Combs
642e77d6f5 CMake: Fix our macOS Intel deployment target 2023-10-03 10:58:43 -07:00
Gerald Combs
bd801bf093 GitLab CI: Only run the Windows Qt5 Build job if the UI code changes 2023-10-03 09:41:17 -07:00
Martin Mathieson
6d96f6dd51 Fix some spelling errors 2023-10-03 15:43:59 +00:00
João Valverde
81cb82abf4 CMake: Try to fix release notes dependencies (take 2) 2023-10-03 15:43:26 +00:00
João Valverde
cd01931eb9 dfilter: Remove syntax node magic number
Syntax nodes always have one type and the compiler
can check it. Reserve magic numbers for data contained
inside syntax node. Remove the magic number field in
stnode_t and the STNODE_MAGIC define. Keep the other
magic values for type checking.

This exposed a bug with an assertion for oper type syntax
nodes. Fix the assertion to check the correct pointer value
against the magic number.
2023-10-03 14:52:56 +00:00
John Thacker
c0885fe390 Find: Switch search_pos to the start byte
There's a lot of potentially confusing arithmetic from setting
search_pos to the last byte of a match. We can always test
search_len against zero to see if we actually had a match for
hightlighting purposes. (The ordinary byte searches won't find
zero length matches, but the regex search might, and not even
necessarily at the start of the bytes if there's a lookbehind term,
and currently they're handled incorrectly.)

We can't find fields with length zero based on an offset currently
anyway. (If we tried, would we match fields that contained the byte
before or after the zero length offset?)

Perhaps we shouldn't allow zero length regex matches for packet
byte searches at all; PCRE2 has an option to prevent such matches.
2023-10-03 08:38:49 -04:00
João Valverde
6de60e12be CMake: Try to fix release notes dependencies 2023-10-03 11:32:10 +00:00
Anders Broman
14f9bcacc2 YACC: Update yacc.py to 3.11 2023-10-03 12:48:40 +02:00
Jaap Keuter
c38e6ecbf6 SAToP: Add optional RTP header handling 2023-10-03 06:07:56 +00:00
João Valverde
46a7f4c17f WSDG: Update build type flags to reflect reality
CMake will add NDEBUG with RelWithDebInfo. Fix that entry.

CMake will not add -O0 with Debug. Fix that entry.

Remove the WS_DEBUG_UTF_8 flag. It is too much detail in
this context.
2023-10-03 00:24:40 +01:00