Stefan Metzmacher [Wed, 25 Oct 2017 09:08:58 +0000 (11:08 +0200)]
epan/dissectors/packet-xml.c no printf
Change-Id: Idd13e4260270f72439273f7562a1f9409e9bb3ef
Stefan Metzmacher [Thu, 19 Oct 2017 08:42:41 +0000 (10:42 +0200)]
epan/dissectors/packet-xml.c try to decrypt data, but the data doesn't look correct yet
Change-Id: I84760941f6da2901eb94a9fc12c76144ef392ad6
Stefan Metzmacher [Wed, 18 Oct 2017 16:35:56 +0000 (18:35 +0200)]
more epan/dissectors/packet-xml.c
Change-Id: Ib4e027d79406ed7ac6cdcefb89cc252ad322b0c8
Stefan Metzmacher [Tue, 17 Oct 2017 15:18:31 +0000 (17:18 +0200)]
Revert "DEBUG epan/dissectors/packet-xml.c"
This reverts commit
2bd4ee0c27e26834cc6db47e18c6c721abfedf45.
Stefan Metzmacher [Tue, 17 Oct 2017 15:18:19 +0000 (17:18 +0200)]
DEBUG epan/dissectors/packet-xml.c
Change-Id: Icfe833203cbcfabd68eb267eabd6659d140cd68f
Stefan Metzmacher [Tue, 17 Oct 2017 15:12:14 +0000 (17:12 +0200)]
epan/dissectors/packet-xml.c o:BinarySecurityToken => GSSAPI
http://docs.oasis-open.org/wss/oasis-wss-kerberos-token-profile-1.1#GSS_Kerberosv5_AP_REQ
Change-Id: I412268f29c8a342d3fe9f1996f387484478bd85e
Stefan Metzmacher [Thu, 19 Oct 2017 11:23:36 +0000 (13:23 +0200)]
TODO: KERBEROS_AD_TARGET_PRINCIPAL (144) TODO ask Microsoft...
Change-Id: Ie7017fe31125edc0315653c13831373ac3e67be8
Stefan Metzmacher [Thu, 19 Oct 2017 11:02:37 +0000 (13:02 +0200)]
kerberos dissect KERBEROS_AD_GSS_API_ETYPE_NEGOTIATION content
Change-Id: Ic4f0e92847151c467f7cc5fca3495e51586d8fd8
Stefan Metzmacher [Tue, 3 Oct 2017 21:37:37 +0000 (23:37 +0200)]
more kerberos
Change-Id: I706ad9b09aae0a6c256fc9e72fe0f70e76aa0b19
Stefan Metzmacher [Thu, 28 Sep 2017 10:59:41 +0000 (12:59 +0200)]
no krb5_cksumtype_to_string
Change-Id: I4ed41ebe238204084fe8b270e7f5e87b342d8fcd
Stefan Metzmacher [Thu, 28 Sep 2017 10:06:10 +0000 (12:06 +0200)]
verify_krb5_pac
Change-Id: I9993e5d92b7efee5aa91cd0e2005787f7d384444
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>
Stefan Metzmacher [Wed, 20 Sep 2017 16:40:14 +0000 (18:40 +0200)]
used_encryption_key
Change-Id: Ic79e67893d182694f0f33074a9eb5130c27800d1
Stefan Metzmacher [Fri, 25 Aug 2017 16:01:27 +0000 (18:01 +0200)]
fix pkinit
Change-Id: Ie9a79d521231d0f4920ece6150e2abfede71e229
Stefan Metzmacher [Fri, 25 Aug 2017 12:34:14 +0000 (14:34 +0200)]
TrustedCA-Win2k => TrustedCA
Change-Id: I1c0fbb5e0b62509cf22b06426ff3f018aeaec8b1
Stefan Metzmacher [Fri, 25 Aug 2017 12:33:38 +0000 (14:33 +0200)]
PA-PK-AS-REP-Win2k ::= PaPkAsRep
Change-Id: Ia5e2758ba0c10246e92994857c8f26310df5636f
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
Stefan Metzmacher [Tue, 4 Oct 2016 19:56:57 +0000 (21:56 +0200)]
more packet-kerberos-template.c
Change-Id: I9267e6ecad47aeae776068552428b0a35d319a21
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.
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
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
Stefan Metzmacher [Sun, 28 Aug 2016 22:03:10 +0000 (00:03 +0200)]
Revert "TODO PAC_DEVICE_INFO..."
This reverts commit
b8e83e7a0cd1cfda0678dec79a2de7bbe83173ac.
Stefan Metzmacher [Mon, 20 Jun 2016 06:00:20 +0000 (08:00 +0200)]
TODO PAC_DEVICE_INFO...
Change-Id: I140af860fd4066a0309e1b4b461966a60acca361
Stefan Metzmacher [Fri, 20 May 2016 05:57:02 +0000 (07:57 +0200)]
new PAC_* types client_claims, device, device_claims
Change-Id: I38b521262b688ba0afbbb9c58b99c3b50dbd2b24
Stefan Metzmacher [Fri, 20 May 2016 05:53:36 +0000 (07:53 +0200)]
sq krb_pa_supported_enctypes
Change-Id: I433dc494350e5e66bc54cf0f73db8c3a7b49b070
Stefan Metzmacher [Tue, 19 Jul 2016 16:16:33 +0000 (18:16 +0200)]
plainlen
Change-Id: Ie9357ed92d9f7e5a7f18766c4bb2c68f3c9726a1
Stefan Metzmacher [Fri, 19 Feb 2016 23:10:51 +0000 (00:10 +0100)]
dissect_krb5_PAC_CREDENTIAL_INFO decrypt...
Change-Id: Id03664513e66b089e2815140a061ec90b9a49232
Stefan Metzmacher [Fri, 19 Feb 2016 13:36:02 +0000 (14:36 +0100)]
packet-kerberos.c ... fix the build u
Change-Id: Ifcfc8817022e3634068d27e71cb66a0b96104cfb
Stefan Metzmacher [Mon, 4 Jan 2016 16:16:10 +0000 (17:16 +0100)]
TODO ... pkinit win2k
Stefan Metzmacher [Mon, 4 Jan 2016 12:49:23 +0000 (13:49 +0100)]
Revert "fix old idl"
This reverts commit
dfcc43164cbbad389a02af420b8eb79bbad19f95.
Stefan Metzmacher [Mon, 4 Jan 2016 12:49:18 +0000 (13:49 +0100)]
Stefan Metzmacher [Sun, 15 Nov 2015 09:49:02 +0000 (10:49 +0100)]
sq h2
Change-Id: I79e3f45456ec118c8f4c1db6702e9e4eac041aa1
Stefan Metzmacher [Sun, 15 Nov 2015 11:17:50 +0000 (12:17 +0100)]
fix old idl
Change-Id: I713fd87769bfe91acea88007d0804d2a0c0ffd6d
Stefan Metzmacher [Sun, 15 Nov 2015 11:18:13 +0000 (12:18 +0100)]
epan/dissectors/pidl/regen.sh
Change-Id: Id72d8ac17893934fe9965ef8608530ac00684af1
Stefan Metzmacher [Mon, 4 Jan 2016 12:41:20 +0000 (13:41 +0100)]
KERBEROS_PA_PK_AS_REQ_OLD
Change-Id: I472884ed84f7d630aede5a2bb65e87c5ad1e76a4
Stefan Metzmacher [Fri, 30 Oct 2015 16:16:21 +0000 (17:16 +0100)]
sq private_data->fast_armor_ acinclude
Change-Id: Ie102ab3b92ac895592ca2bc25ac2f62a6807f6cd
Stefan Metzmacher [Wed, 23 Sep 2015 23:25:53 +0000 (01:25 +0200)]
fix asn1/kerberos/packet-kerberos-template.c
Change-Id: I5aa0ecca17c6a3f25eca78a29733bf9cbcca8318
Stefan Metzmacher [Fri, 20 Mar 2015 16:41:45 +0000 (17:41 +0100)]
EncryptedAuthorizationData ...
Change-Id: Idb6d65800b1787b9cb6fca2630373547b9b7b1bc
Stefan Metzmacher [Sat, 28 Feb 2015 09:31:40 +0000 (10:31 +0100)]
more packet-kerberos...
Change-Id: I2287260e005cc5740eef58305d15528ccd2a6438
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
Stefan Metzmacher [Fri, 20 Feb 2015 18:02:26 +0000 (19:02 +0100)]
improve kerberos_get_private_data again
Change-Id: I40b5b4668b2b12f2ef54b96884b7aab656d3476b
Stefan Metzmacher [Fri, 20 Feb 2015 17:47:56 +0000 (18:47 +0100)]
RFC6113 errors
Change-Id: I2b95bc257762cc8734386171da1bf574220c4530
Stefan Metzmacher [Fri, 20 Feb 2015 17:45:52 +0000 (18:45 +0100)]
TGS fast...
Change-Id: I34289ff8d8f65b1a8ac9b01acec092199a8316d3
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
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
Stefan Metzmacher [Thu, 19 Feb 2015 15:21:10 +0000 (16:21 +0100)]
Revert "debug keys"
This reverts commit
4dedf1b5320fbf58749813f846773ddc4d062ad0.
Change-Id: Ib7b8771f59da4df944db6e9ae197eabdc239c138
Stefan Metzmacher [Thu, 19 Feb 2015 15:18:25 +0000 (16:18 +0100)]
amorkey...
Change-Id: I289b282a57d9696ad7129d9274257d9c875c1c91
Stefan Metzmacher [Thu, 19 Feb 2015 15:05:41 +0000 (16:05 +0100)]
krb5_fast_key
Change-Id: I199ee618777ebe7e769dbf9938fda5d49265e3f4
Stefan Metzmacher [Thu, 19 Feb 2015 14:15:36 +0000 (15:15 +0100)]
private_data->fast_armor_ ...
Change-Id: I377b61d4af3b4e8927321ef770193ad1fc128ec2
Stefan Metzmacher [Thu, 19 Feb 2015 13:07:27 +0000 (14:07 +0100)]
sq more...
Change-Id: I07a5514cda614ad780f6ded3bae02cd34c91473a
Stefan Metzmacher [Thu, 19 Feb 2015 13:06:34 +0000 (14:06 +0100)]
debug keys
Change-Id: If412c294989565ff1346e06e56ac176ccfb89a76
Stefan Metzmacher [Sun, 28 Aug 2016 21:51:01 +0000 (23:51 +0200)]
Revert "plaintext=decrypt_krb5_data => enc_key_t"
This reverts commit
abab9375b0affe7382ef999a071e40c1a1898903.
Stefan Metzmacher [Thu, 19 Feb 2015 13:06:10 +0000 (14:06 +0100)]
plaintext=decrypt_krb5_data => enc_key_t
Change-Id: I7ddff44b1cae573354d97bd538cbfd520471506b
Stefan Metzmacher [Thu, 19 Feb 2015 13:05:21 +0000 (14:05 +0100)]
SPLIT more...
Change-Id: Ib0adf5a74e0872c6fc84dbd1dae27d0622f797ef
Stefan Metzmacher [Thu, 19 Feb 2015 10:17:56 +0000 (11:17 +0100)]
STEP04 sq fix add KERB-AD-RESTRICTION-ENTRY
Change-Id: I5cda2422b75ec89d8a9f8fe11780753517e6287c
Stefan Metzmacher [Thu, 19 Feb 2015 10:02:30 +0000 (11:02 +0100)]
STEP06 ? add dissect_kerberos_AD_AP_OPTIONS
Change-Id: Ic0c69dab9db66c967741a82cb25d2c9fe19137ce
Stefan Metzmacher [Thu, 19 Feb 2015 09:53:19 +0000 (10:53 +0100)]
STEP05 ? handle KERBEROS_AD_AUTHENTICATION_STRENGTH
Change-Id: I66ca3932d8c61aa48b50b5931ab96446ec1d38dc
Stefan Metzmacher [Thu, 19 Feb 2015 09:45:42 +0000 (10:45 +0100)]
STEP04 add KERB-AD-RESTRICTION-ENTRY
Change-Id: Ib5b000927343e091ada10caf786d7af5277455b6
Stefan Metzmacher [Thu, 19 Feb 2015 09:19:43 +0000 (10:19 +0100)]
STEP03 add dissect_kerberos_PA_SUPPORTED_ENCTYPES
Change-Id: I20e09b33ef7a15dd5f5faa4e224de459f0040309
Stefan Metzmacher [Thu, 19 Feb 2015 05:13:55 +0000 (06:13 +0100)]
STEP02 decode PA-PAC-OPTIONS
Change-Id: I4a2ec6793f6a85f46455bcbfdbcca746d00ad883
Stefan Metzmacher [Thu, 19 Feb 2015 04:40:29 +0000 (05:40 +0100)]
STEP01x ? OK RFC6113.asn ....
Change-Id: Ic3327dfde770f9345485bf97e2ac6045b909b64e
Stefan Metzmacher [Mon, 9 Nov 2015 23:10:36 +0000 (00:10 +0100)]
sq AD TYPE
Change-Id: Ia41b3eefd92d109ac476926fdbef381662f7527f
Stefan Metzmacher [Mon, 9 Nov 2015 23:10:16 +0000 (00:10 +0100)]
sq PA TYPE
Change-Id: I6961d5c391a4f5f58e0557c7853938a391478e62
Stefan Metzmacher [Fri, 13 Feb 2015 14:34:44 +0000 (15:34 +0100)]
STEP01 TODO RFC6113.asn
Change-Id: I613cc335f8c46dd62c12500b1dff46c6587c3845
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>
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>
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>
Stefan Metzmacher [Wed, 18 Feb 2015 08:17:35 +0000 (09:17 +0100)]
packet-kerberos: fix flags and options related to anonymous, FAST and contrained delegation
See https://tools.ietf.org/html/rfc6112, https://tools.ietf.org/html/rfc6806
and [MS-SFU].
Change-Id: I058b79168efef49af93bdcaa5e7d74dd55d24f2f
Signed-off-by: Stefan Metzmacher <metze@samba.org>
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>
Stefan Metzmacher [Tue, 29 Sep 2015 17:25:46 +0000 (19:25 +0200)]
prepare-pidl-patch
Change-Id: Ice5d7fe75438cb33bda4cf10059d80ab165a6eb7
Stefan Metzmacher [Tue, 23 Sep 2014 21:13:43 +0000 (23:13 +0200)]
Revert "TODO SMB2 NegotiateContext...."
This reverts commit
df732a47f554f3ba5ce004405089d0d7fbbaf586.
Stefan Metzmacher [Tue, 23 Sep 2014 21:13:29 +0000 (23:13 +0200)]
TODO SMB2 NegotiateContext....
Change-Id: Iff854f2d3824c8bf9f85ce7f160979bc707df222
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>
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
Stefan Metzmacher [Wed, 25 Aug 2010 05:14:40 +0000 (07:14 +0200)]
fix for netmon 3.x captures
metze
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.
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
Stefan Metzmacher [Sat, 7 Nov 2015 08:24:45 +0000 (09:24 +0100)]
Revert "reassamble TODO"
This reverts commit
928e5f57d0b4223f9e9460ca0452f64c4887625d.
Stefan Metzmacher [Sat, 7 Nov 2015 08:24:33 +0000 (09:24 +0100)]
reassamble TODO
Change-Id: I391cc75a5699d9de36decddf519c583cab78ca8b
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>
Michael Mann [Tue, 24 Oct 2017 21:43:33 +0000 (17:43 -0400)]
Add 32x32 png file for UAT "clear list" icon
Change-Id: Ifff401d9014d58c3848e1fcb2f09f09d4391e61e
Reviewed-on: https://code.wireshark.org/review/24043
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Tue, 24 Oct 2017 22:41:24 +0000 (23:41 +0100)]
Remove leftover #define.
Change-Id: Ic18094a487a941a8c76c722afe8e22194b069993
Reviewed-on: https://code.wireshark.org/review/24046
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Mon, 23 Oct 2017 18:00:27 +0000 (19:00 +0100)]
Test g_printf() thousands grouping flag at runtime
This tests the runtime environment so avoid hard-coding it during the build.
For now we avoid messing with locales for the test, unless it turns out to
be necessary (ISO C printf behaviour with invalid conversion specifier is
undefined).
Change-Id: I341c2ab5e716973689cf9002f13435404a41369f
Reviewed-on: https://code.wireshark.org/review/24038
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Guy Harris [Tue, 24 Oct 2017 19:03:19 +0000 (12:03 -0700)]
Fix registration of SIP atop SSL/TLS.
See https://ask.wireshark.org/questions/64151/sip-tls-is-only-shown-as-tcp.
Change-Id: Ife182136601007ff6a5713666d9fada5abcd00b9
Reviewed-on: https://code.wireshark.org/review/24041
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael Mann [Sun, 22 Oct 2017 15:35:12 +0000 (11:35 -0400)]
mqtt: Use proto_tree_add_bitmask
Change-Id: I8e9cd64edcabf810e70b134ecce7a771babafebc
Reviewed-on: https://code.wireshark.org/review/24017
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
João Valverde [Sun, 22 Oct 2017 19:30:07 +0000 (20:30 +0100)]
Make plugin support a runtime property
Keep the option to disable at compile-time but use AC_ARG_ENABLE instead.
Change-Id: Ie8c3f5ba0db1eb6d9d4ffd742cd3aa049ead5007
Reviewed-on: https://code.wireshark.org/review/24026
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Mon, 23 Oct 2017 18:46:16 +0000 (19:46 +0100)]
configure: Remove ancient inet_pton test for brokenness
Change-Id: Idac71883b6a1c6c78ae79e929f1c67a295ed9035
Reviewed-on: https://code.wireshark.org/review/24037
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Eliot Lear [Mon, 23 Oct 2017 12:44:12 +0000 (14:44 +0200)]
Get program to the right working directory.
Otherwise patches breaks.
Change-Id: Ief735dc949eaefa3515cc0a5936e0a2735cb0241
Reviewed-on: https://code.wireshark.org/review/24035
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Bruno Verstuyft [Mon, 23 Oct 2017 08:35:53 +0000 (10:35 +0200)]
DOCSIS: fixed TLV name
Change-Id: Ibfc8310e1a150fb2e04f7dad9a68d08e8d0364b7
Reviewed-on: https://code.wireshark.org/review/24032
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>
Eldon Stegall [Tue, 17 Oct 2017 14:55:52 +0000 (14:55 +0000)]
Improve http object export for URLs with long extensions
This allows the export of objects with extensions that may be longer
than the allowed file name of an export (due to underlying filesystem, etc).
The extension detection mechanism previously preserved everything in the file
name after the final ".", but in some cases (especially with long query strings)
this would exceed the allowed maximum file length, and simply refuse to export
the object. Now, if the length of the extension and duplicate number is longer
than the allowable file length, the extension is ignored, and the entire string
is truncated to allow an acceptable export filename.
Bug: 14130
Change-Id: I6fa0281519d031c07a9ac621002ac328f34f54cc
Reviewed-on: https://code.wireshark.org/review/23960
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>
Alexis La Goutte [Sun, 22 Oct 2017 16:35:49 +0000 (18:35 +0200)]
ssl-utils: Add export tls13_hkdf_expand_label
for reuse on QUIC dissector
Change-Id: Ic1d6b875e1e1944bb2aa6c7a85bfdd984c00948c
Reviewed-on: https://code.wireshark.org/review/24018
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Sun, 22 Oct 2017 13:16:53 +0000 (14:16 +0100)]
AirPcap is Windows only, reflect that in about dialog
Change-Id: Iecde2ada76a63da47e80cf0188945dab2a7e5b89
Reviewed-on: https://code.wireshark.org/review/24023
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Michael Mann [Sun, 22 Oct 2017 02:50:16 +0000 (22:50 -0400)]
Add "Apply as filter" button to Coloring Rules Dialog
Add a button to apply currently selected color as the display filter.
Bug: 14100
Change-Id: Ife3edeb577075f1fe30b649a5655ef5887684d8a
Reviewed-on: https://code.wireshark.org/review/24012
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Sun, 22 Oct 2017 16:40:47 +0000 (18:40 +0200)]
QUIC: Add draft-07 value_string
Change-Id: Icc4cfc4ce007eac29d9a502eae76527713e93e05
Ping-Bug: 13881
Reviewed-on: https://code.wireshark.org/review/24019
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Sun, 22 Oct 2017 19:28:05 +0000 (21:28 +0200)]
mqtt: Fix some mistakes from previous commit
- PUBREL, SUBSCRIBE and UNSUBSCRIBE does use QoS for v3.1
- CONNACK is also different between v3.1 and v3.1.1
- DUP flag is not reserved, it's Retain which is reserved
- Use proto_tree_add_item for reserved fields
- Use uniform layout and fixed indent (2 spaces in this file)
Change-Id: I26337ad63cd67d832db84993349fa3406e305b72
Reviewed-on: https://code.wireshark.org/review/24025
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Flavio Santes [Sun, 15 Oct 2017 10:18:38 +0000 (06:18 -0400)]
[RFC] dissector/mqtt: Fix handling of fixed header flags
According to the MQTT v3.1 and v3.1.1 specifications,
the fixed header flags (DUP, QoS and RETAIN) are only set by
the PUBLISH message.
The DUP flag is also set by the PUBREL, SUBSCRIBE and
UNSUBSCRIBE messages but only when version 3.1 is used.
Currently, the MQTT dissector shows the header flags for
all the v3.1 and v3.1.1 messages.
This patch fixes the issues mentioned above.
To track the protocol version used during the connection handshake
a conversation is used. For subsequent messages, the way the header
flags are displayed is determined by this variable.
Change-Id: Iad808f77a2c379f9786152c26d3aa86e24be1b16
Signed-off-by: Flavio Santes <flavio.santes@1byt3.com>
Reviewed-on: https://code.wireshark.org/review/23939
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Sun, 22 Oct 2017 18:07:29 +0000 (19:07 +0100)]
Fix make distcheck
Change-Id: Ie6b49429a5a72a4ed7b76fa74b1a6f33b6811254
Reviewed-on: https://code.wireshark.org/review/24022
Reviewed-by: João Valverde <j@v6e.pt>
Gerald Combs [Sun, 22 Oct 2017 17:06:12 +0000 (17:06 +0000)]
[Automatic update for 2017-10-22]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: I973703f2a82c96e47ec15512e223766404a6d3a1
Reviewed-on: https://code.wireshark.org/review/24021
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Eliot Lear [Sun, 22 Oct 2017 09:35:33 +0000 (11:35 +0200)]
Add IANA arc and first entry (MUDURL) for lldp.
PCAP file: https://github.com/the-tcpdump-group/tcpdump/blob/master/tests/lldp_mudurl.pcap
Change-Id: If1f4946f8a8ade44dbab33a877bf7449f9ea2a6f
Reviewed-on: https://code.wireshark.org/review/23982
Reviewed-by: Michael Mann <mmann78@netscape.net>
Cal Turney [Sun, 8 Oct 2017 02:06:12 +0000 (22:06 -0400)]
NFSv4: Fix for duplicate StateId hashes
In WS v11.4.0 released In May, 2014, "tvb_get_string_enc()" was added to
dissect_nfs4_stateid() which treats the numeric stateid as a string and
converted it to UTF-8. Invalid UTF-8 chars were replaced with the
"REPLACEMENT CHARACTER" which are actually three characters: 0xef, 0xbf,
and 0xbd (0xefbfbd). A hash was made of the first 16 chars of the returned
array although the string was often much larger due to 1 to 16 invalid
chars. This has often caused duplicate hashes for different files and
locks. That routine has been removed. In addition, the size of the hash
has been reduced from 32 to 16 bits which affords a 99.9984% chance of
unique hashes. Finally, hf_nfs4_seqid, used for the stateid hash seqid
has been changed to hf_nfs4_seqid_stateid because in CLOSE requests the
seqid has nothing to do with the stateid seqid.
Change-Id: I3bf7caefc3341887a4c9137500dfeac0115af8cf
Reviewed-on: https://code.wireshark.org/review/23966
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>