metze/wireshark/wip.git
5 months agono krb5_cksumtype_to_string
Stefan Metzmacher [Thu, 28 Sep 2017 10:59:41 +0000 (12:59 +0200)]
no krb5_cksumtype_to_string

Change-Id: I4ed41ebe238204084fe8b270e7f5e87b342d8fcd

5 months agoverify_krb5_pac
Stefan Metzmacher [Thu, 28 Sep 2017 10:06:10 +0000 (12:06 +0200)]
verify_krb5_pac

Change-Id: I9993e5d92b7efee5aa91cd0e2005787f7d384444

5 months agosmb-direct: move Flags into data_tree.
Stefan Metzmacher [Thu, 28 Sep 2017 08:08:40 +0000 (10:08 +0200)]
smb-direct: move Flags into data_tree.

Change-Id: I919994c084d4f5702b0a6d504c8cd5a8b716498b
Signed-off-by: Stefan Metzmacher <metze@samba.org>
5 months agoused_encryption_key
Stefan Metzmacher [Wed, 20 Sep 2017 16:40:14 +0000 (18:40 +0200)]
used_encryption_key

Change-Id: Ic79e67893d182694f0f33074a9eb5130c27800d1

5 months agofix pkinit
Stefan Metzmacher [Fri, 25 Aug 2017 16:01:27 +0000 (18:01 +0200)]
fix pkinit

Change-Id: Ie9a79d521231d0f4920ece6150e2abfede71e229

5 months agoTrustedCA-Win2k => TrustedCA
Stefan Metzmacher [Fri, 25 Aug 2017 12:34:14 +0000 (14:34 +0200)]
TrustedCA-Win2k => TrustedCA

Change-Id: I1c0fbb5e0b62509cf22b06426ff3f018aeaec8b1

5 months agoPA-PK-AS-REP-Win2k ::= PaPkAsRep
Stefan Metzmacher [Fri, 25 Aug 2017 12:33:38 +0000 (14:33 +0200)]
PA-PK-AS-REP-Win2k ::= PaPkAsRep

Change-Id: Ia5e2758ba0c10246e92994857c8f26310df5636f

5 months agoTODO decrypt_krb5_data => proto_tree_add_expert_format cryptotvb TODO: decrypted_tvb
Stefan Metzmacher [Tue, 4 Oct 2016 19:26:58 +0000 (21:26 +0200)]
TODO decrypt_krb5_data => proto_tree_add_expert_format cryptotvb TODO: decrypted_tvb

Change-Id: Idacf506d3a60c8f1d757ce44881aaae3f5541543

5 months agomore packet-kerberos-template.c
Stefan Metzmacher [Tue, 4 Oct 2016 19:56:57 +0000 (21:56 +0200)]
more packet-kerberos-template.c

Change-Id: I9267e6ecad47aeae776068552428b0a35d319a21

5 months agoRevert "TODO decrypt_krb5_data => proto_tree_add_expert_format cryptotvb TODO: decryp...
Stefan Metzmacher [Tue, 4 Oct 2016 19:50:42 +0000 (21:50 +0200)]
Revert "TODO decrypt_krb5_data => proto_tree_add_expert_format cryptotvb TODO: decrypted_tvb"

This reverts commit 8bbe4f579f6f93725e3623dc9a9d592ce60ae6f4.

5 months agoTODO decrypt_krb5_data => proto_tree_add_expert_format cryptotvb TODO: decrypted_tvb
Stefan Metzmacher [Tue, 4 Oct 2016 19:26:58 +0000 (21:26 +0200)]
TODO decrypt_krb5_data => proto_tree_add_expert_format cryptotvb TODO: decrypted_tvb

Change-Id: Idacf506d3a60c8f1d757ce44881aaae3f5541543

5 months agoepan/dissectors/packet-dcerpc.c dcerpc-hardening part1 & part2
Stefan Metzmacher [Sun, 18 Sep 2016 00:40:14 +0000 (02:40 +0200)]
epan/dissectors/packet-dcerpc.c dcerpc-hardening part1 & part2

Change-Id: I907663775f5ebfe66cb994266f99fc15bf645fb1

5 months agoRevert "TODO PAC_DEVICE_INFO..."
Stefan Metzmacher [Sun, 28 Aug 2016 22:03:10 +0000 (00:03 +0200)]
Revert "TODO PAC_DEVICE_INFO..."

This reverts commit b8e83e7a0cd1cfda0678dec79a2de7bbe83173ac.

5 months agoTODO PAC_DEVICE_INFO...
Stefan Metzmacher [Mon, 20 Jun 2016 06:00:20 +0000 (08:00 +0200)]
TODO PAC_DEVICE_INFO...

Change-Id: I140af860fd4066a0309e1b4b461966a60acca361

5 months agonew PAC_* types client_claims, device, device_claims
Stefan Metzmacher [Fri, 20 May 2016 05:57:02 +0000 (07:57 +0200)]
new PAC_* types client_claims, device, device_claims

Change-Id: I38b521262b688ba0afbbb9c58b99c3b50dbd2b24

5 months agosq krb_pa_supported_enctypes
Stefan Metzmacher [Fri, 20 May 2016 05:53:36 +0000 (07:53 +0200)]
sq krb_pa_supported_enctypes

Change-Id: I433dc494350e5e66bc54cf0f73db8c3a7b49b070

5 months agoplainlen
Stefan Metzmacher [Tue, 19 Jul 2016 16:16:33 +0000 (18:16 +0200)]
plainlen

Change-Id: Ie9357ed92d9f7e5a7f18766c4bb2c68f3c9726a1

5 months agodissect_krb5_PAC_CREDENTIAL_INFO decrypt...
Stefan Metzmacher [Fri, 19 Feb 2016 23:10:51 +0000 (00:10 +0100)]
dissect_krb5_PAC_CREDENTIAL_INFO decrypt...

Change-Id: Id03664513e66b089e2815140a061ec90b9a49232

5 months agopacket-kerberos.c ... fix the build u
Stefan Metzmacher [Fri, 19 Feb 2016 13:36:02 +0000 (14:36 +0100)]
packet-kerberos.c ... fix the build u

Change-Id: Ifcfc8817022e3634068d27e71cb66a0b96104cfb

5 months agoTODO ... pkinit win2k
Stefan Metzmacher [Mon, 4 Jan 2016 16:16:10 +0000 (17:16 +0100)]
TODO ... pkinit win2k

5 months agoRevert "fix old idl"
Stefan Metzmacher [Mon, 4 Jan 2016 12:49:23 +0000 (13:49 +0100)]
Revert "fix old idl"

This reverts commit dfcc43164cbbad389a02af420b8eb79bbad19f95.

5 months agoRevert "sq h2"
Stefan Metzmacher [Mon, 4 Jan 2016 12:49:18 +0000 (13:49 +0100)]
Revert "sq h2"

This reverts commit cd2d739ed5463692fb6cf0355c6e8bc2f5bbda22.

5 months agosq h2
Stefan Metzmacher [Sun, 15 Nov 2015 09:49:02 +0000 (10:49 +0100)]
sq h2

Change-Id: I79e3f45456ec118c8f4c1db6702e9e4eac041aa1

5 months agofix old idl
Stefan Metzmacher [Sun, 15 Nov 2015 11:17:50 +0000 (12:17 +0100)]
fix old idl

Change-Id: I713fd87769bfe91acea88007d0804d2a0c0ffd6d

5 months agoepan/dissectors/pidl/regen.sh
Stefan Metzmacher [Sun, 15 Nov 2015 11:18:13 +0000 (12:18 +0100)]
epan/dissectors/pidl/regen.sh

Change-Id: Id72d8ac17893934fe9965ef8608530ac00684af1

5 months agoKERBEROS_PA_PK_AS_REQ_OLD
Stefan Metzmacher [Mon, 4 Jan 2016 12:41:20 +0000 (13:41 +0100)]
KERBEROS_PA_PK_AS_REQ_OLD

Change-Id: I472884ed84f7d630aede5a2bb65e87c5ad1e76a4

5 months agofix asn1/kerberos/packet-kerberos-template.c
Stefan Metzmacher [Wed, 23 Sep 2015 23:25:53 +0000 (01:25 +0200)]
fix asn1/kerberos/packet-kerberos-template.c

Change-Id: I5aa0ecca17c6a3f25eca78a29733bf9cbcca8318

5 months agoEncryptedAuthorizationData ...
Stefan Metzmacher [Fri, 20 Mar 2015 16:41:45 +0000 (17:41 +0100)]
EncryptedAuthorizationData ...

Change-Id: Idb6d65800b1787b9cb6fca2630373547b9b7b1bc

5 months agomore packet-kerberos...
Stefan Metzmacher [Sat, 28 Feb 2015 09:31:40 +0000 (10:31 +0100)]
more packet-kerberos...

Change-Id: I2287260e005cc5740eef58305d15528ccd2a6438

5 months agoTODO packet-kerberos: dissect non-ntstatus PA-PW-SALT fields
Stefan Metzmacher [Fri, 27 Feb 2015 13:02:56 +0000 (14:02 +0100)]
TODO packet-kerberos: dissect non-ntstatus PA-PW-SALT fields

These are generated by Samba KDC's (at least 4.0, 4.1 and 4.2)
in an AS-REP instead of having a PA-EYTPES-INFO2 entry with the salt
information.

Change-Id: I19345cb3f9c863e54a8f16002987912487f7d76a

5 months agoimprove kerberos_get_private_data again
Stefan Metzmacher [Fri, 20 Feb 2015 18:02:26 +0000 (19:02 +0100)]
improve kerberos_get_private_data again

Change-Id: I40b5b4668b2b12f2ef54b96884b7aab656d3476b

5 months agoRFC6113 errors
Stefan Metzmacher [Fri, 20 Feb 2015 17:47:56 +0000 (18:47 +0100)]
RFC6113 errors

Change-Id: I2b95bc257762cc8734386171da1bf574220c4530

5 months agoTGS fast...
Stefan Metzmacher [Fri, 20 Feb 2015 17:45:52 +0000 (18:45 +0100)]
TGS fast...

Change-Id: I34289ff8d8f65b1a8ac9b01acec092199a8316d3

5 months agoKRB5_ET_KDC_ERR_WRONG_REALM with fast error
Stefan Metzmacher [Fri, 20 Feb 2015 16:52:27 +0000 (17:52 +0100)]
KRB5_ET_KDC_ERR_WRONG_REALM with fast error

Change-Id: Ia3dc6533b676ecdb8b878d53d62a12a851f76cb5

5 months agoTODO tgs and wrong realm complete fast ... TODO heimdal??? extra armor and strengthen...
Stefan Metzmacher [Fri, 20 Feb 2015 12:43:19 +0000 (13:43 +0100)]
TODO tgs and wrong realm complete fast ... TODO heimdal??? extra armor and strengthen lists?

Change-Id: I6b1b2773e432494b248540f4b152479f471df07e

5 months agoRevert "debug keys"
Stefan Metzmacher [Thu, 19 Feb 2015 15:21:10 +0000 (16:21 +0100)]
Revert "debug keys"

This reverts commit 4dedf1b5320fbf58749813f846773ddc4d062ad0.

Change-Id: Ib7b8771f59da4df944db6e9ae197eabdc239c138

5 months agoamorkey...
Stefan Metzmacher [Thu, 19 Feb 2015 15:18:25 +0000 (16:18 +0100)]
amorkey...

Change-Id: I289b282a57d9696ad7129d9274257d9c875c1c91

5 months agokrb5_fast_key TODO check for HAVE_KRB5_C_FX_CF2_SIMPLE HAVE_KRB5_CRYPTO_FX_CF2
Stefan Metzmacher [Thu, 19 Feb 2015 15:05:41 +0000 (16:05 +0100)]
krb5_fast_key TODO check for HAVE_KRB5_C_FX_CF2_SIMPLE HAVE_KRB5_CRYPTO_FX_CF2

Change-Id: I199ee618777ebe7e769dbf9938fda5d49265e3f4

5 months agoprivate_data->fast_armor_ ...
Stefan Metzmacher [Thu, 19 Feb 2015 14:15:36 +0000 (15:15 +0100)]
private_data->fast_armor_ ...

Change-Id: I377b61d4af3b4e8927321ef770193ad1fc128ec2

5 months agosq more...
Stefan Metzmacher [Thu, 19 Feb 2015 13:07:27 +0000 (14:07 +0100)]
sq more...

Change-Id: I07a5514cda614ad780f6ded3bae02cd34c91473a

5 months agodebug keys
Stefan Metzmacher [Thu, 19 Feb 2015 13:06:34 +0000 (14:06 +0100)]
debug keys

Change-Id: If412c294989565ff1346e06e56ac176ccfb89a76

5 months agoRevert "plaintext=decrypt_krb5_data => enc_key_t"
Stefan Metzmacher [Thu, 19 Apr 2018 20:54:07 +0000 (22:54 +0200)]
Revert "plaintext=decrypt_krb5_data => enc_key_t"

This reverts commit e1c49b573f40605262cf3ee5ca5c19c74a8cb339.

5 months agoplaintext=decrypt_krb5_data => enc_key_t
Stefan Metzmacher [Thu, 19 Feb 2015 13:06:10 +0000 (14:06 +0100)]
plaintext=decrypt_krb5_data => enc_key_t

Change-Id: I7ddff44b1cae573354d97bd538cbfd520471506b

5 months agoSPLIT more... use .FN_HDR???
Stefan Metzmacher [Thu, 10 Jan 2019 08:41:31 +0000 (09:41 +0100)]
SPLIT more... use .FN_HDR???

Change-Id: Ib0adf5a74e0872c6fc84dbd1dae27d0622f797ef

5 months agoSTEP04 sq fix add KERB-AD-RESTRICTION-ENTRY
Stefan Metzmacher [Thu, 19 Feb 2015 10:17:56 +0000 (11:17 +0100)]
STEP04 sq fix add KERB-AD-RESTRICTION-ENTRY

Change-Id: I5cda2422b75ec89d8a9f8fe11780753517e6287c

5 months agoSTEP06 ? add dissect_kerberos_AD_AP_OPTIONS
Stefan Metzmacher [Thu, 19 Feb 2015 10:02:30 +0000 (11:02 +0100)]
STEP06 ? add dissect_kerberos_AD_AP_OPTIONS

Change-Id: Ic0c69dab9db66c967741a82cb25d2c9fe19137ce

5 months agoSTEP05 ? handle KERBEROS_AD_AUTHENTICATION_STRENGTH
Stefan Metzmacher [Thu, 19 Feb 2015 09:53:19 +0000 (10:53 +0100)]
STEP05 ? handle KERBEROS_AD_AUTHENTICATION_STRENGTH

Change-Id: I66ca3932d8c61aa48b50b5931ab96446ec1d38dc

5 months agoSTEP04 add KERB-AD-RESTRICTION-ENTRY
Stefan Metzmacher [Thu, 19 Feb 2015 09:45:42 +0000 (10:45 +0100)]
STEP04 add KERB-AD-RESTRICTION-ENTRY

Change-Id: Ib5b000927343e091ada10caf786d7af5277455b6

5 months agoSTEP03 add dissect_kerberos_PA_SUPPORTED_ENCTYPES
Stefan Metzmacher [Thu, 19 Feb 2015 09:19:43 +0000 (10:19 +0100)]
STEP03 add dissect_kerberos_PA_SUPPORTED_ENCTYPES

Change-Id: I20e09b33ef7a15dd5f5faa4e224de459f0040309

5 months agoSTEP02 decode PA-PAC-OPTIONS
Stefan Metzmacher [Thu, 19 Feb 2015 05:13:55 +0000 (06:13 +0100)]
STEP02 decode PA-PAC-OPTIONS

Change-Id: I4a2ec6793f6a85f46455bcbfdbcca746d00ad883

5 months agoSTEP01x ? OK RFC6113.asn ....
Stefan Metzmacher [Thu, 19 Feb 2015 04:40:29 +0000 (05:40 +0100)]
STEP01x ? OK RFC6113.asn ....

was OK as cee8d8d0be... STEP01x ? OK RFC6113.asn ....
as part of 4d69fe275175b4efb20a54bd8bd7f85d8d28bd61 (wireshark-wip/ws-metze/20181017)

Change-Id: Ic3327dfde770f9345485bf97e2ac6045b909b64e

5 months agosq AD TYPE
Stefan Metzmacher [Mon, 9 Nov 2015 23:10:36 +0000 (00:10 +0100)]
sq AD TYPE

Change-Id: Ia41b3eefd92d109ac476926fdbef381662f7527f

5 months agosq PA TYPE
Stefan Metzmacher [Mon, 9 Nov 2015 23:10:16 +0000 (00:10 +0100)]
sq PA TYPE

Change-Id: I6961d5c391a4f5f58e0557c7853938a391478e62

5 months agopacket-kerberos: add more AUTHDATA-TYPE values and autogenerate kerberos_AUTHDATA_TYP...
Stefan Metzmacher [Wed, 18 Feb 2015 12:01:14 +0000 (13:01 +0100)]
packet-kerberos: add more AUTHDATA-TYPE values and autogenerate kerberos_AUTHDATA_TYPE_vals

The new AUTHDATA-TYPE values are from RFC6113 and MS-KILE.

Change-Id: I269e498f6d0e7f707b5c45fab848114b2d57df03
Signed-off-by: Stefan Metzmacher <metze@samba.org>
5 months agopacket-kerberos: add more PADATA-TYPE values and autogenerate kerberos_PADATA_TYPE_vals
Stefan Metzmacher [Tue, 17 Feb 2015 08:39:47 +0000 (09:39 +0100)]
packet-kerberos: add more PADATA-TYPE values and autogenerate kerberos_PADATA_TYPE_vals

The new PADATA-TYPE values taken from rfc6113.txt

Change-Id: I42e50996c5694c34fc4714189b2e004bbbd501cf
Signed-off-by: Stefan Metzmacher <metze@samba.org>
5 months agoasn2wrs: add VALS_ATTR section
Stefan Metzmacher [Wed, 18 Feb 2015 14:10:29 +0000 (15:10 +0100)]
asn2wrs: add VALS_ATTR section

One important thing is the UPPER_CASE_FIRST flag,

INTERGER value string identifiers have to start with a lower case
letter, but UPPER_CASE_FIRST fixes this in the displayed string.

Change-Id: I902ffc7125c4bf0c2e1a9ac7105c10dad348707c
Signed-off-by: Stefan Metzmacher <metze@samba.org>
5 months agopacket-kerberos: add a hint to the used decryption key
Stefan Metzmacher [Fri, 20 Feb 2015 09:40:22 +0000 (10:40 +0100)]
packet-kerberos: add a hint to the used decryption key

Change-Id: I6f4bb1e46abb30212a87be2b574dc2679d8b7aed
Signed-off-by: Stefan Metzmacher <metze@samba.org>
5 months agoprepare-pidl-patch
Stefan Metzmacher [Tue, 29 Sep 2015 17:25:46 +0000 (19:25 +0200)]
prepare-pidl-patch

Change-Id: Ice5d7fe75438cb33bda4cf10059d80ab165a6eb7

5 months agoRevert "TODO SMB2 NegotiateContext...."
Stefan Metzmacher [Tue, 23 Sep 2014 21:13:43 +0000 (23:13 +0200)]
Revert "TODO SMB2 NegotiateContext...."

This reverts commit df732a47f554f3ba5ce004405089d0d7fbbaf586.

5 months agoTODO SMB2 NegotiateContext....
Stefan Metzmacher [Tue, 23 Sep 2014 21:13:29 +0000 (23:13 +0200)]
TODO SMB2 NegotiateContext....

Change-Id: Iff854f2d3824c8bf9f85ce7f160979bc707df222

5 months agoMIT krb5-1.12 HACK patch: Add a HACK patch for building a patched kerberos library
Matthieu Patou [Mon, 23 Sep 2013 06:24:24 +0000 (23:24 -0700)]
MIT krb5-1.12 HACK patch: Add a HACK patch for building a patched kerberos library

Also works with krb5-1.10 and maybe others too.

Change-Id: I115a07b1ddc45c99cb96b90054cb79f944749979
Signed-off-by: Matthieu Patou <mat@matws.net>
5 months agoMIT krb5-1.6 HACK patch
Stefan Metzmacher [Sat, 25 Jul 2009 08:23:26 +0000 (10:23 +0200)]
MIT krb5-1.6 HACK patch

Apply this patch to krb5-1.6.x and build it
with a special prefix that only wireshark will use!

Then start wireshark with a script like this:

-----
metze@SERNOX:~/devel/wireshark/wireshark.git$ cat ~/bin/mxwrap.wireshark.krb5

export LD_LIBRARY_PATH="/home/metze/prefix/mit-krb5-1-6/lib/:$LD_LIBRARY_PATH"
exec /home/metze/devel/prefix/wireshark/bin/wireshark $@
gdb --args /home/metze/devel/prefix/wireshark/bin/wireshark $@
------

The LD_PRELOAD only works if the krb5 library version your system one,
then you just need to replace "libk5crypto.so", otherwise wireshark
needs to all of the custom libraries.

metze

5 months agofix for netmon 3.x captures
Stefan Metzmacher [Wed, 25 Aug 2010 05:14:40 +0000 (07:14 +0200)]
fix for netmon 3.x captures

metze

5 months agoRevert "HACK setup decryption keys for kerberos session setups smbclient..."
Stefan Metzmacher [Tue, 25 Feb 2014 14:50:00 +0000 (15:50 +0100)]
Revert "HACK setup decryption keys for kerberos session setups smbclient..."

This reverts commit e701801b515a28b997e9013fd1bdfd4c5dbbea26.

5 months agoHACK setup decryption keys for kerberos session setups smbclient...
Stefan Metzmacher [Tue, 25 Feb 2014 14:37:01 +0000 (15:37 +0100)]
HACK setup decryption keys for kerberos session setups smbclient...

Change-Id: I573e44de014ec318998e1bb612c95d877136594f

5 months agoRevert "reassamble TODO"
Stefan Metzmacher [Sat, 7 Nov 2015 08:24:45 +0000 (09:24 +0100)]
Revert "reassamble TODO"

This reverts commit 928e5f57d0b4223f9e9460ca0452f64c4887625d.

5 months agoreassamble TODO
Stefan Metzmacher [Sat, 7 Nov 2015 08:24:33 +0000 (09:24 +0100)]
reassamble TODO

Change-Id: I391cc75a5699d9de36decddf519c583cab78ca8b

5 months agowmem: allow wmem_destroy_list to ignore a NULL list.
Stefan Metzmacher [Tue, 21 Jun 2016 06:55:35 +0000 (08:55 +0200)]
wmem: allow wmem_destroy_list to ignore a NULL list.

I think this should not lead to a crash.

Change-Id: Ic9d903d355f925b2cd5239d51b42f441679ed771
Signed-off-by: Stefan Metzmacher <metze@samba.org>
5 months agoCMake: do not set RPATH when installing to a system directory
Peter Wu [Sat, 19 Jan 2019 00:59:29 +0000 (01:59 +0100)]
CMake: do not set RPATH when installing to a system directory

When built with -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
(as is done by many Linux distributions), do not set an unnecessary
RPATH. This was the case before v2.9.0rc0-2727-g697623411c.

Relocatable builds will still be possible with the default options as
/usr/local/lib is typically not considered a system library path.

Change-Id: Ic6ff1760183c20d3f9f9fb787604e888e116534e
Reviewed-on: https://code.wireshark.org/review/31602
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 months agojson_dumper: increase JSON_DUMPER_MAX_DEPTH to 1100.
Dario Lombardo [Sat, 19 Jan 2019 22:36:53 +0000 (23:36 +0100)]
json_dumper: increase JSON_DUMPER_MAX_DEPTH to 1100.

The new value has been chosen to make room for sharkd packet output
as: proto.c:MAX_TREE_LEVELS * 2 + 10% of additional sharkd overhead.

A new regression test for sharkd has been added that requires more
than 15 levels.

Change-Id: Ie54955c79c50c60b95c99b1a3c472888fc4842ac
Reviewed-on: https://code.wireshark.org/review/31624
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 months agoQUIC: fix packet number spaces and verification (draft -17)
Peter Wu [Sun, 20 Jan 2019 18:04:28 +0000 (19:04 +0100)]
QUIC: fix packet number spaces and verification (draft -17)

Decryption would fail after switching from Initial to the Handshake
message due to the packet number changing from 1 to 0 which would result
in the wrong reconstructed packet number. To fix this, implement three
different packet spaces and update the full packet number only if
decryption succeeds.

While at it, document all tricky interactions between packet number
spaces and different secrets / ciphers.

Bug: 13881
Change-Id: Ic88a83cdf76cb024054de8a32ea959bd1dacaca3
Reviewed-on: https://code.wireshark.org/review/31635
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
5 months agoQUIC: fix handshake decryption (draft -17)
Peter Wu [Sun, 20 Jan 2019 16:36:17 +0000 (17:36 +0100)]
QUIC: fix handshake decryption (draft -17)

Packet numbers in handshake messages are protected by a cipher different
from the initial cipher.

Bug: 13881
Change-Id: Ife6524c0525df10ff3c64f4333908b189f823509
Reviewed-on: https://code.wireshark.org/review/31634
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agoGSM-SIM: Add file ID for DF.CDMA
Darien Spencer [Sat, 19 Jan 2019 21:07:24 +0000 (23:07 +0200)]
GSM-SIM: Add file ID for DF.CDMA

Change-Id: Ib8066c14d2a8a0e4b0464cd833518c06d2eb801c
Reviewed-on: https://code.wireshark.org/review/31613
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agosrt: redundant prototypes declaration
Alexis La Goutte [Sun, 20 Jan 2019 15:26:44 +0000 (15:26 +0000)]
srt: redundant prototypes declaration

 redundant redeclaration of ‘proto_register_srt’ [-Wredundant-decls]
redundant redeclaration of ‘proto_reg_handoff_srt’ [-Wredundant-decls]

Change-Id: Ifcc5dc5185f01601f2193c2596fa075885a412d6
Reviewed-on: https://code.wireshark.org/review/31633
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agoGSM-SIM: Fix sw value for file ID not found
Darien Spencer [Sat, 19 Jan 2019 21:30:33 +0000 (23:30 +0200)]
GSM-SIM: Fix sw value for file ID not found

Change-Id: I8c4976f55c60b1d6f78ef16d7d385978d49789d4
Reviewed-on: https://code.wireshark.org/review/31617
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agoQUIC: fix long packet type numbers (draft -17)
Peter Wu [Sun, 20 Jan 2019 12:18:03 +0000 (13:18 +0100)]
QUIC: fix long packet type numbers (draft -17)

Swap Retry and 0-RTT Protected identifiers to fix connection tracking
and decryption. Fix detection of Retry packets.

Bug: 13881
Change-Id: I41d1b5674a5ec634b3c55bee72d6943664039dba
Reviewed-on: https://code.wireshark.org/review/31629
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agoNFS: Display ClientID in info col for Renew requests
Uli Heilmeier [Sun, 20 Jan 2019 11:03:30 +0000 (12:03 +0100)]
NFS: Display ClientID in info col for Renew requests

Instead of showing the CRC16 value of the clientid, this commit
displays the real value of the clientid in the INFO column.

Bug: 15432
Change-Id: Iaeae89bf7dfe4b08746a4da9515f25f9ae6c02ac
Reviewed-on: https://code.wireshark.org/review/31628
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agoCMake: Replace PACKAGELIST magic
João Valverde [Thu, 10 Jan 2019 01:45:00 +0000 (01:45 +0000)]
CMake: Replace PACKAGELIST magic

This is more explicit and easier to read with slightly better locality
while using less code.

Also less awkward when the package doesn't fit the narrow package list
expectations.

The ws_find_package() macro doesn't include all the status messages. The
choice was to rely on standard find_package() and feature_summary() output
and be less verbose.

Avoid polluting the CLI build interface. Per target include paths and
macro definitions are preferred.

Because this patch intentionally removes the global CMAKE_*_FLAGS
and include_directories() usage in favor of target properties, some
untested build configurations may inadvertently break because of
missing ${PACKAGE}_INCLUDE_DIRS or ${PACKAGE}_DEFINITIONS. This
required a manual review of dependencies that might have been
incomplete.

${PACKAGE_VAR}_LINK_FLAGS seems to be unused.

Changing the CMake Qt code to use more modern CMake component syntax
is left as future work.

Change-Id: I3ed75252189a6e05a23ed6e619088f519cd7ed78
Reviewed-on: https://code.wireshark.org/review/31496
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 months ago[Automatic update for 2019-01-20]
Gerald Combs [Sun, 20 Jan 2019 08:30:26 +0000 (08:30 +0000)]
[Automatic update for 2019-01-20]

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

Change-Id: I18a5419a2953f5893aa76e2823c50d48e284b270
Reviewed-on: https://code.wireshark.org/review/31625
Reviewed-by: Gerald Combs <gerald@wireshark.org>
5 months agoOpenFlow 1.5: implement version specific parts
Christophe GUERBER [Thu, 17 Jan 2019 08:51:31 +0000 (09:51 +0100)]
OpenFlow 1.5: implement version specific parts

B.18.1 Egress Tables (EXT-306):
B.18.2 Packet Type aware pipeline (EXT-112)
B.18.3 Extensible Flow Entry Statistics (EXT-334)
B.18.4 Flow Entry Statistics Trigger (EXT-335)
B.18.6 Packet Register pipeline fields (EXT-244)
B.18.11 Scheduled Bundles (EXT-340)
B.18.12 Controller connection status (EXT-454)
B.18.14 Enable setting all pipeline fields in packet-out (EXT-427)
B.18.15 Port properties for pipeline fields (EXT-388)
B.18.16 Port property for recirculation (EXT-399)
B.18.21 Rename some type for consistency (EXT-302)

Change-Id: I02d2370f6cf661e400bb8b690213589cd030a541
Reviewed-on: https://code.wireshark.org/review/31566
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agoCMake: do not set an invalid INSTALL_RPATH for (plugin) libraries
João Valverde [Sat, 19 Jan 2019 13:26:14 +0000 (13:26 +0000)]
CMake: do not set an invalid INSTALL_RPATH for (plugin) libraries

CMAKE_INSTALL_RPATH also applies to libraries such as plugins. This
should not happen when relative RPATHs (through $ORIGIN) are in use, so
fix that.

Change-Id: I154d93ba6ed66c2f78a42b25e352b5b54e9b8818
Reviewed-on: https://code.wireshark.org/review/31609
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 months agoRename a Boolean flag variable to reflect the non-default behavior.
Guy Harris [Sat, 19 Jan 2019 21:55:45 +0000 (13:55 -0800)]
Rename a Boolean flag variable to reflect the non-default behavior.

This makes it slightly clearer, from code inspection, what the -C flag
does.  The default behavior is to continue; -C cause capinfos to stop,
rather than continue, after an open failure.

Change-Id: I8bc67ce61c5d828c7f0ed87ee397ef994ff99aa4
Reviewed-on: https://code.wireshark.org/review/31621
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 months agoRevert "Change comment to reflect reality."
Guy Harris [Sat, 19 Jan 2019 21:39:36 +0000 (21:39 +0000)]
Revert "Change comment to reflect reality."

This reverts commit b32c8432c76ab9e86fb1fd796fa5600d181e02ae.

Reason for revert: the variable name was confusing - it describes
the behavior if the -C flag is *absent*, and -C sets it to *false*.

Change-Id: Ia4d2fb954466b710db3fd1b9897feb9f3818c3a9
Reviewed-on: https://code.wireshark.org/review/31618
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 months agoChange comment to reflect reality.
Guy Harris [Sat, 19 Jan 2019 21:34:14 +0000 (13:34 -0800)]
Change comment to reflect reality.

When the -C flag was added, it meant (and still means) "[C]ontinue after
open errors", which was new behavior; the default "exit on open errors"
behavior was not changed.

Change-Id: I066c1aaef544e57efb39404e2dd61acbd9a91754
Reviewed-on: https://code.wireshark.org/review/31614
Reviewed-by: Guy Harris <guy@alum.mit.edu>
5 months agoMEGACO: fix dissection of Remote Descriptor
Pascal Quantin [Sat, 19 Jan 2019 13:26:54 +0000 (14:26 +0100)]
MEGACO: fix dissection of Remote Descriptor

Display the right field name.

Bug: 15430
Change-Id: I1d7da96a351bfad275142a36975df294bfec1a50
Reviewed-on: https://code.wireshark.org/review/31608
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 months agoNGAP: dissect NASC IE
Pascal Quantin [Sat, 19 Jan 2019 12:52:47 +0000 (13:52 +0100)]
NGAP: dissect NASC IE

Change-Id: I35210fe4088afb69f9b03b9cfcc12e8309ccd8b3
Reviewed-on: https://code.wireshark.org/review/31607
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 months agoLTE RRC: dissect 2 InterNode IEs
Pascal Quantin [Sat, 19 Jan 2019 11:28:15 +0000 (12:28 +0100)]
LTE RRC: dissect 2 InterNode IEs

Change-Id: I17424675a7b60f468e94134f17533cd891d135f7
Reviewed-on: https://code.wireshark.org/review/31606
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 months agodiam_dict.l,wimaxasncp_dict.l: fix -Werror=stringop-truncation
Peter Wu [Fri, 18 Jan 2019 23:32:49 +0000 (00:32 +0100)]
diam_dict.l,wimaxasncp_dict.l: fix -Werror=stringop-truncation

The given "len" is the size of the string in "txt" excluding the NUL
terminator. GCC 8.2.1+20181127-1 rightfully complains that strncpy will
not terminate the destination buffer.

Change-Id: I592c7c218cf07c13697de4e60f454326a93d1124
Reviewed-on: https://code.wireshark.org/review/31600
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agovwr: fix -Werror=maybe-uninitialized with GCC 8.2.1+20181127-1
Peter Wu [Fri, 18 Jan 2019 23:13:06 +0000 (00:13 +0100)]
vwr: fix -Werror=maybe-uninitialized with GCC 8.2.1+20181127-1

Change-Id: I58d61d29719facb5d639bdbd7e3d790096f69486
Reviewed-on: https://code.wireshark.org/review/31599
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agoZigBee: Correct command names in Key-Establishment cluster
Kenneth Soerensen [Fri, 18 Jan 2019 12:16:28 +0000 (13:16 +0100)]
ZigBee: Correct command names in Key-Establishment cluster

Change-Id: I5c6a25bfc31160c722ddefb811cc3b1beeec772b
Reviewed-on: https://code.wireshark.org/review/31594
Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agoLTE RRC: upgrade dissector to v15.4.0
Pascal Quantin [Fri, 18 Jan 2019 17:40:00 +0000 (18:40 +0100)]
LTE RRC: upgrade dissector to v15.4.0

Change-Id: I90b3a5afe782992eac98b37336cc9267ba73dbc0
Reviewed-on: https://code.wireshark.org/review/31595
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
5 months agoCMake: avoid including file modification time for RCC
Peter Wu [Fri, 18 Jan 2019 12:39:41 +0000 (13:39 +0100)]
CMake: avoid including file modification time for RCC

Resources such as translations (autogenerated qm files) and SVG images
resulted in non-reproducible builds. Be sure to disable this to make the
resources reproducible on Qt < 5.8 or Qt >= 5.9 (excluding Qt 5.8.x).

With this change, the Wireshark build is reproducible invariant of the
build directory (but not the source directory).

Bug: 15163
Change-Id: I9240d2aa6e7298e1928c0f1d97ce83673320024d
Reviewed-on: https://code.wireshark.org/review/31593
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 months agonas5gs: Add NAS 5GS media type dissection.
Anders Broman [Fri, 18 Jan 2019 12:37:19 +0000 (13:37 +0100)]
nas5gs: Add NAS 5GS media type dissection.

While at it set p2p_dir.

Change-Id: Ia63ba998db72353963eddc4baa811ce552fd617a
Reviewed-on: https://code.wireshark.org/review/31590
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Joakim Karlsson <oakimk@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agogprscdr: Added backward compabillity addition in ChangeCondition
Joakim Karlsson [Fri, 18 Jan 2019 11:53:12 +0000 (12:53 +0100)]
gprscdr: Added backward compabillity addition in ChangeCondition

Adding back values existed in older relese, rel6, rel7.

Change-Id: I68de38965dc5de2ac39c04467810ce93af37fe1f
Reviewed-on: https://code.wireshark.org/review/31587
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agoCMake: set CMAKE_BUILD_RPATH_USE_ORIGIN
Peter Wu [Fri, 18 Jan 2019 10:18:42 +0000 (11:18 +0100)]
CMake: set CMAKE_BUILD_RPATH_USE_ORIGIN

Tested with cmake v3.13.3-952-gf4c17c041, the resulting binaries indeed
contain $ORIGIN and are invariant of the build directory.

Change-Id: I5dad9493a6d54a0b03a3494fce69cc69a25b2f84
Ping-Bug: 15163
Reviewed-on: https://code.wireshark.org/review/31586
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 months agogitlab-ci: keep artifacts in rpm builds.
Dario Lombardo [Thu, 17 Jan 2019 09:13:09 +0000 (10:13 +0100)]
gitlab-ci: keep artifacts in rpm builds.

Change-Id: I7117c05a59b82bd925f82dfdfdda770fa507b7d4
Reviewed-on: https://code.wireshark.org/review/31575
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
5 months agogitlab-ci: use ninja in opensuse builds.
Dario Lombardo [Thu, 17 Jan 2019 13:08:07 +0000 (14:08 +0100)]
gitlab-ci: use ninja in opensuse builds.

Change-Id: I80df02fb3db6ab5a742726c3beaa30a203db7237
Reviewed-on: https://code.wireshark.org/review/31576
Reviewed-by: Dario Lombardo <lomato@gmail.com>
5 months agodocbook: use fixed space section for filters code.
Dario Lombardo [Thu, 17 Jan 2019 10:42:26 +0000 (11:42 +0100)]
docbook: use fixed space section for filters code.

Change-Id: I6052bc3ec9705a272d0cd6f31cf8b5c1f4b8d45c
Reviewed-on: https://code.wireshark.org/review/31573
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
5 months agoIEEE 802.11 dissector: Fixed description for reason code 12
Mister X [Thu, 17 Jan 2019 00:59:04 +0000 (17:59 -0700)]
IEEE 802.11 dissector: Fixed description for reason code 12

Change-Id: I5031f4ca7401be0e785502abfe871cda52388085
Reviewed-on: https://code.wireshark.org/review/31570
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
5 months agoebhscr: increasing ebhscr snaplen
Pantar Ana [Tue, 15 Jan 2019 13:38:09 +0000 (14:38 +0100)]
ebhscr: increasing ebhscr snaplen

Change-Id: Ie033196c099927912b1e7849299e786dc8416923
Reviewed-on: https://code.wireshark.org/review/31554
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>