GitLab

Update manuf, services enterprise numbers, translations, and other items.

Jason Cohen authored May 17, 2022 and Alexis La Goutte committed May 18, 2022

Some versions of BIG-IP create Type 2 Version 0 records with the
Type 2 Version 1 size.  Allow for the decoding of these records.


(cherry picked from commit 0cab39a8)

Update manuf, services enterprise numbers, translations, and other items.

Update manuf, services enterprise numbers, translations, and other items.

The handshake hash is used to derive TLS decryption keys when the
Extended Master Secret (EMS) extension is in use.
ssl_calculate_handshake_hash updates this hash only when the master
secret has not been determined yet.

During TLS renegotiation, there are two master secrets: one before, and
one after. Before this fix, the second calculated master secret is
wrong because the second Client Hello is missing in the handshake hash.
It was missing because the handshake hash was not being updated since
the master secret for the first handshake was still present, and the
decryption state was only reset after that hash update.

To fix this, make sure to clear the SSL_MASTER_SECRET flag before
updating the handshake hash when needed. Additionally, clear the
handshake hash when processing the Client Hello just to make sure that
any previous state is gone.

Fixes #18059

(cherry picked from commit 62100da7)

[skip ci]

[skip ci]

Update manuf, services enterprise numbers, translations, and other items.

Duplicate Dialog Token field

Fix #18050


(cherry picked from commit 19dc602f)

Update manuf, services enterprise numbers, translations, and other items.

Gerald Combs authored Apr 21, 2022 and Gerald Combs committed Apr 21, 2022

Remove our Sparkle 1 code. Fixes #18035.

(cherry picked from commit 4bb16383)

Conflicts:
	CMakeLists.txt

Gerald Combs authored Apr 19, 2022 and Gerald Combs committed Apr 21, 2022

Check for null conversations in conversation_add_proto_data,
conversation_get_proto_data, and conversation_delete_proto_data.
Document them as well. Ping #18043.

(cherry picked from commit 88f07ff5)

Gerald Combs authored Apr 20, 2022 and Gerald Combs committed Apr 20, 2022

Sparkle's XPC services are only needed if we're sandboxing, so remove
them.

[skip ci]

(cherry picked from commit c2fd5055)

Gerald Combs authored Apr 20, 2022 and Gerald Combs committed Apr 20, 2022

Sign our XPCs. Add another Brotli fixup.

(cherry picked from commit d024502c)

Gerald Combs authored Apr 20, 2022 and Gerald Combs committed Apr 20, 2022

Update our application bundle script to handle Sparkle 2 and its assets.

(cherry picked from commit 486fd46f)

Gerald Combs authored Apr 09, 2022 and Gerald Combs committed Apr 18, 2022

Sparkle 2 deprecated the sharedUpdater singleton, so create our own
which uses Sparkle 2's updated API. Ping #18035.

Update our CMake version check.

(cherry picked from commit fea6591b)

Conflicts:
	.editorconfig
	CMakeLists.txt

Gerald Combs authored Apr 17, 2022 and Gerald Combs committed Apr 17, 2022

[skip ci]

(cherry picked from commit 05c86efc)

Update manuf, services enterprise numbers, translations, and other items.

Chuck Craft authored Apr 14, 2022 and Guy Harris committed Apr 15, 2022

Closes #18038


(cherry picked from commit 98793186)

Chuck Craft authored Apr 12, 2022 and Guy Harris committed Apr 14, 2022

Needed to format timestamp in #18038 - packet-cql.c
Mirrors changes made in !1924 - Add ENC_TIME_NSECS timestamp encoding
Documentation in README.dissector, proto.c, proto.h - could use
refresh in a different merge request.

(backported from commit 4e0cd3db)

Nicolás Alvarez authored Feb 03, 2021 and Guy Harris committed Apr 14, 2022

- Fix duplicate "are are".
- Fix NTP epoch year in ENC_TIME_NTP docs (572b80d2 fixed it in the README
  but not in proto.h).
- Remove completely redundant "(ie. )" clauses.


(cherry picked from commit 981e662a)

Nicolás Alvarez authored Feb 03, 2021 and Guy Harris committed Apr 14, 2022

ENC_TIME_MIP6 and ENC_TIME_CLASSIC_MAC_OS_SECS were added recently by
factoring them out of specific dissectors, but they weren't documented.
I added documentation, based on comments in the dissector code they came
from.


(cherry picked from commit 0e86ea6c)

Richard Sharpe authored Apr 06, 2022 and Gerald Combs committed Apr 12, 2022

The numbers were reversed.

Closes #18030


(cherry picked from commit 34f8420d)

Gerald Combs authored Apr 10, 2022 and Gerald Combs committed Apr 10, 2022

We use debian-setup.sh and rpm-setup.sh to build the containers in
https://gitlab.com/wireshark/wireshark-containers/. Make sure they fail
with a nonzero exit status, otherwise we might end up with an invalid
container image.

Make sure OPTIONS is defined in all of the setup scripts that use it.

(cherry picked from commit bd6ee447)

Conflicts:
	tools/arch-setup.sh
	tools/msys2-setup.sh
	tools/rpm-setup.sh

The Sparkle project recently released Sparkle 2.0.0, which deprecates
the version 1 API. Add version discovery to FindSparkle.cmake and
require version 1 until we add support for the new API. Ping #17861.

(cherry picked from commit a6e24a62)

Conflicts:
	CMakeLists.txt

Update manuf, services enterprise numbers, translations, and other items.

Thomas Jansen authored Apr 06, 2022 and Alexis La Goutte committed Apr 07, 2022

RFC 8781 shows in section 4 that the prefix field of the PREF64 option
header is always 96 bits (or 12 bytes), regardless of the prefix length
code that only specifies which parts of the prefix are significant. The
option itself thus always has a fixed length. Even if they are not used
in the significant part of the prefix itself, the unused bits are still
part of the prefix field of the PREF64 option and the offset must be
adapted accordingly.

The previous implementation would fail to correctly parse any PREF64
option with a PLC other than 0 (i.e. the full 96 bits) due to the unused
remaining bits in the option not being consumed.

Closes #18033.


(cherry picked from commit aac695d6)

Jiří Engelthaler authored Apr 02, 2022 and Guy Harris committed Apr 03, 2022

Closes issue #18023


(cherry picked from commit 248f11dd)

John Thacker authored Apr 01, 2022 and Gerald Combs committed Apr 03, 2022

ssl_dissector_add registers TLS as the dissector for TCP for the given
port. We can't use it, since on port 3389 TPKT (for RDP) can be over TLS
or directly over TCP, depending on the RDP security settings.
Fix #17952.


(cherry picked from commit 6dfd96f6)

Update manuf, services enterprise numbers, translations, and other items.

Update manuf, services enterprise numbers, translations, and other items.

[skip ci]

[skip ci]

Update manuf, services enterprise numbers, translations, and other items.

dissect_http_message might get called with a nonzero offset into
the tvb if there are multiple messages/segments in a frame. Only
send data starting from that offset to the follow tap, instead of
starting at tvb offset 0. Fix #18006


(cherry picked from commit 37a00545)

This allows the "needs to be reloaded" indication to be set in the close
process, as is the case for ERF; having a routine that returns the value
of that indication is not useful if it gets seet in the close process,
as the handle for the wtap_dumper is no longer valid after
wtap_dump_close() finishes.

Fixes #17989.

(backported from commit 109b92b5)

Update manuf, services enterprise numbers, translations, and other items.

Update manuf, services enterprise numbers, translations, and other items.