-
Notifications
You must be signed in to change notification settings - Fork 12
/
ChangeLog
1966 lines (1504 loc) · 76.7 KB
/
ChangeLog
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
commit 530d85e072
Author: Gerald Combs <[email protected]>
Date: Thu Oct 11 10:58:36 2018 -0700
Release prep 2.6.4.
Change-Id: I004614722e0ce1d80e1da402dcf7183c73869d0f
commit dd35b8bab7
Author: Gerald Combs <[email protected]>
Date: Wed Oct 10 14:17:24 2018 -0700
Update the release notes for 2.6.4.
Change-Id: I133daa5433ee51375cd674d2e3e9b54c7054db2a
Reviewed-on: https://code.wireshark.org/review/30122
Reviewed-by: Gerald Combs <[email protected]>
commit cfc1111322
Author: Gerald Combs <[email protected]>
Date: Wed Oct 10 08:41:35 2018 -0700
Autotools: Fix Shellcheck discovery.
Use AC_PATH_PROG to find Shellcheck instead of AC_CHECK_PROG.
Bug: 15165
Change-Id: I718f71bb60efa64a289e2887a51983e061e3c2d3
Reviewed-on: https://code.wireshark.org/review/30118
Petri-Dish: Gerald Combs <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <[email protected]>
commit 9ad5b4b6e0
Author: Peter Wu <[email protected]>
Date: Sun Aug 12 13:17:29 2018 +0200
HTTP: ignore large Content-Length values
The SSTP capture from bug 8239 failed to be recognized as SSTP. Its
large Content-Length was parsed as -1 which triggered reassembly due to
tvb_bytes_exist returning FALSE for negative lengths.
Test:
# Expect 'SSTP_DUPLEX_POST /' in the output of:
tshark -r sstp.pcapng -ossl.keys_list:localhost,443,http,sstp.pem, -Y frame.number==174 -Px
Change-Id: I40afaff8554f34f24e09bab184121ced59045954
Fixes: v2.9.0rc0-531-gd80acae40d ("tvbuff: make tvb_bytes_exist fail with negative values")
Reviewed-on: https://code.wireshark.org/review/29109
Petri-Dish: Peter Wu <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit 4802e3300dc18a973f74990d0d3f96068a7759d1)
Reviewed-on: https://code.wireshark.org/review/30119
Reviewed-by: Peter Wu <[email protected]>
commit b2bbd9fdf2
Author: Peter Wu <[email protected]>
Date: Tue Oct 9 19:18:34 2018 +0200
coap: ensure that piv_len matches piv
In frame 121, piv_len was 1 while piv was NULL. Ensure that both piv and
piv_len are reset to avoid this. Adjust another check to ensure that piv
and piv_len are in sync (probably not necessary, but it seems the
intention).
Bug: 15172
Change-Id: If8636d32f3273d6707749c807bd7d676ca9ab96d
Fixes: v2.5.2rc0-9-g830ea5731a ("CoAP: Hooks to OSCORE")
Reviewed-on: https://code.wireshark.org/review/30100
Petri-Dish: Peter Wu <[email protected]>
Petri-Dish: Gerald Combs <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit 5a2aafef7a8ad4b3917823133c2e3534951fc4d3)
Reviewed-on: https://code.wireshark.org/review/30111
Reviewed-by: Peter Wu <[email protected]>
commit 7571da4358
Author: Peter Wu <[email protected]>
Date: Tue Oct 9 17:14:11 2018 +0200
ftype-protocol: do not return from TRY/CATCH
TRY/CATCH are macros, before returning the ENDTRY block must be executed
or the weirdest crashes can occur.
Change-Id: Ic56871322f8567263e2b8a81cce5a3c7042301b7
Fixes: v2.1.0rc0-2939-g5493fe0167 ("Convert ftype-tvbuff.c to ftype-protocol.c")
Reviewed-on: https://code.wireshark.org/review/30095
Petri-Dish: Peter Wu <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit 8c31cdc13c546107235b86cfa9a539c436448f2e)
Reviewed-on: https://code.wireshark.org/review/30109
Reviewed-by: Peter Wu <[email protected]>
commit 6e920ddc3c
Author: Peter Wu <[email protected]>
Date: Tue Oct 9 18:16:11 2018 +0200
steam-ihs: fix memleak on exception
When protobuf_dissect_unknown_field throws an exception,
steamdiscover_dissect_body_status will leak memory as
wmem_destroy_allocator is not called. Capture fuzz-2018-10-06-3104.pcap
from the linked bug leaks 64kiB memory in each frame 14 and 36.
Bug: 15171
Change-Id: I930d0738fde61799ab4ef2310f8ff11c1bcb032b
Fixes: v2.5.1rc0-130-g7ae954c7ac ("steam-ihs: Add dissector for the Steam IHS Discovery Protocol")
Reviewed-on: https://code.wireshark.org/review/30098
Petri-Dish: Peter Wu <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit f3986c24728f03a346a10388fd6c15ea9ae16d41)
Reviewed-on: https://code.wireshark.org/review/30108
Reviewed-by: Peter Wu <[email protected]>
commit 73fd53f068
Author: James Ko <[email protected]>
Date: Thu Oct 4 18:09:28 2018 -0700
Fix Windows dumpcap -i TCP@
Reading from a TCP socket in Windows must not change read state
variables to values required by cap_thread_read on pipes.
Bug: 15149
Change-Id: I1efa9288b5954dc4a18b2c68772c54a098a224e7
Reviewed-on: https://code.wireshark.org/review/29894
Reviewed-by: Peter Wu <[email protected]>
Petri-Dish: Peter Wu <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit 354c0d4e5f9e988e2f62ee7818456af0bac90cbf)
Reviewed-on: https://code.wireshark.org/review/30087
commit 6f2c61cef2
Author: Guy Harris <[email protected]>
Date: Mon Oct 8 12:00:34 2018 -0700
Get rid of duplicate declaration.
Change-Id: Ief942bab72928ff683d9ee11384e1efe23356f58
Reviewed-on: https://code.wireshark.org/review/30081
Reviewed-by: Guy Harris <[email protected]>
commit cb45d1fcb6
Author: Guy Harris <[email protected]>
Date: Sun Oct 7 21:35:03 2018 -0700
Make sure we avoid the local code page for command-line arguments.
Do in WinMain() as we do in the Qt main() - fetch the command line with
GetCommandLineW(), convert it to an argument count and array of UTF-16
strings with CommandLineToArgvW(), and then convert them to an array of
UTF-8 strings with arg_list_utf_16to8().
Change-Id: I04bd4182b1ff62573eb132531f4c7f2360f376cc
Reviewed-on: https://code.wireshark.org/review/30067
Petri-Dish: Guy Harris <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <[email protected]>
commit 9828b3c5b4
Author: Guy Harris <[email protected]>
Date: Mon Oct 8 10:35:11 2018 -0700
No need to check for dladdr in autotools, either, as we're no longer using it.
Get rid of an unnecessary test of HAVE_DLADDR and an unnecessary include
of <dlfcn.h> while we're at it.
Change-Id: Ie231b49fdb7de182529e0e7b4d785ceee3a8b806
Reviewed-on: https://code.wireshark.org/review/30078
Reviewed-by: Guy Harris <[email protected]>
commit 75a3d3b0fd
Author: Guy Harris <[email protected]>
Date: Sat May 5 00:19:09 2018 -0700
Don't use dladdr() to get a pathname for the current executable().
Change-Id: I24ad11a659c2cb936f873339dc2b36ac9944280a
Reviewed-on: https://code.wireshark.org/review/27359
Petri-Dish: Guy Harris <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit 15cfc41e9441c648caf10483520ba3503f2824a0)
Reviewed-on: https://code.wireshark.org/review/30076
commit d7d9886fdf
Author: Guy Harris <[email protected]>
Date: Sun Oct 7 19:04:50 2018 -0700
Bring back arg_list_utf_16to8(), but have it just do UTF-16-to-UTF-8 mapping.
Call it from wmain() in the command-line tools, passing it the input
argument count and vector, and call it from main() in Wireshark, after
getting a UTF-16 argument vector from passing the result of
GetCommandLineW() to CommandLineToArgvW().
Change-Id: I0e51703c0a6c92f7892d196e700ab437bd702514
Reviewed-on: https://code.wireshark.org/review/30063
Petri-Dish: Guy Harris <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit bce13644e9d528a153f87019738a1582c9cae606)
Reviewed-on: https://code.wireshark.org/review/30064
commit 16e7fe4040
Author: Guy Harris <[email protected]>
Date: Sun Oct 7 10:06:00 2018 -0700
Use wsetargv.obj, and wmain() rather than main(), on Windows.
Doing so for command-line programs means that the argument list doesn't
ever get converted to the local code page; converting to the local code
page can mangle file names that *can't* be converted to the local code
page.
Furthermore, code that uses setargv.obj rather than wsetargv.obj has
issues in some versions of Windows 10; see bug 15151.
That means that converting the argument list to UTF-8 is a bit simpler -
we don't need to call GetCommandLineW() or CommandLineToArgvW(), we just
loop over the UTF-16LE argument strings in argv[].
While we're at it, note in Wireshark's main() why we discard argv on
Windows (Qt does the same "convert-to-the-local-code-page" stuff); that
means we *do* need to call GetCommandLineW() and CommandLineToArgvW() in
main() (i.e., we duplicate what Qt's WinMain() does, but converting to
UTF-8 rather than to the local code page).
Change-Id: I35b57c1b658fb3e9b0c685097afe324e9fe98649
Ping-Bug: 15151
Reviewed-on: https://code.wireshark.org/review/30051
Petri-Dish: Guy Harris <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit a679ae6f791ac6b02f342d3b73d6b4aecb9ca6e9)
Reviewed-on: https://code.wireshark.org/review/30061
commit b743423e6a
Author: Guy Harris <[email protected]>
Date: Tue Oct 2 14:06:21 2018 -0700
You have to add setargv.obj as a link flag, not as a library.
Change-Id: Iab00c28b8fdb5649a115fb7f006ba176d4a4223e
Reviewed-on: https://code.wireshark.org/review/29986
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit 105f2d68d81416e322152f0edc62ec1434a9d604)
Reviewed-on: https://code.wireshark.org/review/30059
commit d49e0576dc
Author: Guy Harris <[email protected]>
Date: Tue Oct 2 13:33:02 2018 -0700
We should only link executables with setargv.obj.
Libraries shouldn't be linked with it.
See if this fixes the weird problems I'm having with mergecap -
including, apparently, the mergecap from the buildbots - when run with
wildcard arguments, terminating before it gets to main() (making it hard
to try to debug bug 15151).
Change-Id: Ie793b0ea8157186a121106636ac8b782457c09f5
Reviewed-on: https://code.wireshark.org/review/29985
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit 97972ea9ff4ba1dc485070197486bb5fffedf774)
Reviewed-on: https://code.wireshark.org/review/30057
commit ce01899863
Author: Gerald Combs <[email protected]>
Date: Sun Oct 7 08:42:37 2018 +0000
[Automatic update for 2018-10-07]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: Ib790c47144a4e10c202083dcd04177474b7cbbd3
Reviewed-on: https://code.wireshark.org/review/30047
Reviewed-by: Gerald Combs <[email protected]>
commit c07a9a0b02
Author: Stig Bjørlykke <[email protected]>
Date: Fri Oct 5 19:54:59 2018 +0200
Qt: Call createIOGraph() when duplicating an existing IO Graph
Call createIOGraph() when adding a new graph by duplicating
an existing to actually create the new graph.
This is a regression from g5b3e3ee5.
Change-Id: If1d8e4386a44dc4867d75fbad2d9ebb2e4b22307
Reviewed-on: https://code.wireshark.org/review/30036
Petri-Dish: Stig Bjørlykke <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
commit f797c7901c
Author: Uli Heilmeier <[email protected]>
Date: Fri Oct 5 08:54:55 2018 +0200
*shark: Update help and manpage for name resolving
Add 'v' option for VLAN ID resolving and get rid of
deprecated 'C' option.
Bug: 14826
Change-Id: I63104f4a465d251048693ad02882ea7eb2c4d926
Reviewed-on: https://code.wireshark.org/review/30029
Petri-Dish: Anders Broman <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
Reviewed-on: https://code.wireshark.org/review/30037
Reviewed-by: Alexis La Goutte <[email protected]>
commit f99ea22e77
Author: Guy Harris <[email protected]>
Date: Thu Oct 4 23:25:01 2018 -0700
Don't assume we have Qt *at all* when setting HAVE_QT_VERSION_4.
Bug: 15166
Change-Id: Ic9131ff0d456cc8b546a5a36c97a3c0b1c241fcd
Reviewed-on: https://code.wireshark.org/review/30026
Reviewed-by: Guy Harris <[email protected]>
commit 4b3d75cbfb
Author: Jeff Morriss <[email protected]>
Date: Thu Oct 4 10:07:36 2018 -0400
h248_3gpp: register an ett.
Unregistered etts will lead to an assertion/abort when used.
Change-Id: I2837311fcf472417ba36670e42073d15d475afd6
Reviewed-on: https://code.wireshark.org/review/30017
Petri-Dish: Jeff Morriss <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit 102fb519a7fb9504d3ba27bf15cf10c977fee4a1)
Reviewed-on: https://code.wireshark.org/review/30020
commit bcacdd2824
Author: Jeff Morriss <[email protected]>
Date: Fri Sep 7 14:10:08 2018 -0400
Register some unregistered etts.
... Use of an unregistered ett leads to an abort.
Inspired by I3ee2f557ace1643dfba5a978add66c3c7ba7d895. Some day I should get
the ett_ registration checking code in checkAPIs ready for prime time...
Conflicts:
epan/dissectors/asn1/ngap/packet-ngap-template.c
epan/dissectors/packet-ieee80211-radiotap.c
epan/dissectors/packet-ngap.c
Change-Id: I69162d4bcec571e6a517a107ac365aa78bfe8d25
Reviewed-on: https://code.wireshark.org/review/29474
Petri-Dish: Jeff Morriss <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit 98207eb612b024359d3212d0432cb38342741250)
Reviewed-on: https://code.wireshark.org/review/30016
commit cfb90bbfff
Author: Guy Harris <[email protected]>
Date: Tue Oct 2 04:20:19 2018 -0700
Clean up some things.
Rename ascend_seek() to ascend_find_next_packet(), to indicate what it
does; it doesn't seek to an arbitrary place, it tries to find the
starting offset of the next packet when reading sequentially.
Don't have it set the header type - that's the job of the parser.
Don't set the "next packet seek start" when doing random access I/O -
that field is only for sequential I/O, and we don't want random I/O
happening at the same time (which can happen in Wireshark) interfering.
Clean up comments.
Change-Id: I2808479eeec074afa16945ffb577b91d8cb356f7
Reviewed-on: https://code.wireshark.org/review/29975
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit 5076c1c02ef3b2fa8fb0ce2405629aab3ff7fa3c)
Reviewed-on: https://code.wireshark.org/review/29976
commit f15bf6afb8
Author: Guy Harris <[email protected]>
Date: Tue Oct 2 04:03:28 2018 -0700
Don't return TRUE with *err or *err_info set.
Read and seek-read routines shouldn't do that; it causes TShark to
report an error when there was no error.
Change-Id: If564348fa01dce83c6a2317ac56ac8716d514bf7
Reviewed-on: https://code.wireshark.org/review/29972
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit c8bf7f47cd51ee49e8d53877b3900f5cff200d11)
Reviewed-on: https://code.wireshark.org/review/29973
commit 384e06de65
Author: Peter Wu <[email protected]>
Date: Tue Oct 2 00:00:16 2018 +0200
TLS: fix reassembly regression when extending a PDU
The fragment identifier was changed, but fragment_set_partial_reassembly
was left unchanged which broke reassembly/decryption when a subdissector
finishes reassembly, but then requests further reassembly (like HTTP
with chunked encoding). This bug results in a faulty "Reassembly error,
protocol TLS: New fragment past old data limits" message.
Bug: 15158
Change-Id: I636ef623dd65c3feb58da29adf7125d8458f038f
Fixes: v2.9.0rc0-2003-gbe16d87c60 ("TLS: fix broken reassembly with multiple PDUs in the same frame")
Reviewed-on: https://code.wireshark.org/review/29967
Petri-Dish: Peter Wu <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit 2263ce4f63f91f58d840c628dccaec6a72a0d6fc)
Reviewed-on: https://code.wireshark.org/review/29970
Reviewed-by: Peter Wu <[email protected]>
commit 2b349e3706
Author: Guy Harris <[email protected]>
Date: Sun Sep 30 21:23:04 2018 -0700
Fix handling of some ISDN calls.
There's no guarantee that there will be two digits after PRI-XMIT or
PRI-RCV; the capture file in bug 3535, for exmaple, has "PRI-XMIT-0/1"
and "PRI-RCV-0".
Require a minimum of 1, not 2, non-{/(:} characters. Leave the maximum
of 20 in place.
Change-Id: Ie8f8f4ff5eb04baf0ee61bf28015e59a1fa43948
Reviewed-on: https://code.wireshark.org/review/29947
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit d8c1db34969cb5fe6c9ed6d4ff36bdd3ec37ab87)
Reviewed-on: https://code.wireshark.org/review/29965
commit 5618a81287
Author: Peter Wu <[email protected]>
Date: Sun Sep 30 12:07:49 2018 +0200
ieee80211: fix addresses for ToDS=1|FromDS=1 case
For Data frames with ToDs=1|FromDS=1 and a Frame body containing A-MSDU,
the Addr3 and Addr4 fields are not Destination/Source addresses (DA/SA),
but BSSID/BSSID. Use the RA/TA fields for the Hw Dest/Src columns and
add another BSSID field for Addr4 (should match Addr3, but in theory the
wire format could have different values).
While at it, fix the A-MSDU case for other cases to match 802.11-2016
Table 9-26 Address field contents. The "Short A-MSDU" case as used by
DNG STAs are not handled here though.
Tested against a capture with MSDU frames (all but ToDS=1|FromDS=1) and
the test case from the linked bug.
Bug: 15144
Change-Id: Ic832d7cd7b8e05a1408353cb79c07efed0fb19cc
Reviewed-on: https://code.wireshark.org/review/29935
Petri-Dish: Peter Wu <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit b3cbb4faf12691af2cc9127b36889b7593306409)
Reviewed-on: https://code.wireshark.org/review/29957
Reviewed-by: Peter Wu <[email protected]>
commit 703ead5b04
Author: Stig Bjørlykke <[email protected]>
Date: Mon Oct 1 10:14:19 2018 +0200
Qt: Set enabled properties in Filter Dialog
Default set enabled property to false for deleteToolButton and
copyToolButton because no item is selected.
Change-Id: I99bfb572abb9bc38cbf49c6b1fabdeefac4f8d90
Reviewed-on: https://code.wireshark.org/review/29951
Reviewed-by: Stig Bjørlykke <[email protected]>
(cherry picked from commit 6be0abac261ca375dca4aa19c5a90e7f97a1ea8c)
Reviewed-on: https://code.wireshark.org/review/29952
commit d5a057e2d2
Author: Stig Bjørlykke <[email protected]>
Date: Mon Oct 1 09:56:49 2018 +0200
Qt: Set enabled properties in Coloring Rules Dialog
Default set enabled property to false for deleteToolButton and
copyToolButton because no item is selected.
Change-Id: I6ead2fa17cf1fd5bc165526fb76d104af6d5234d
Reviewed-on: https://code.wireshark.org/review/29949
Reviewed-by: Stig Bjørlykke <[email protected]>
(cherry picked from commit 67f47a9f1c1e2ce4d88cd2ca35de87544d7118b8)
Reviewed-on: https://code.wireshark.org/review/29950
commit c8583e041e
Author: Guy Harris <[email protected]>
Date: Sun Sep 30 14:06:37 2018 -0700
Show the *per-file* encapsulation in the __tostring method.
We use the per-file encapsulation everywhere else; use it there as well.
Change-Id: I3e3df234a9f541a9d90e54a3c0f41b5019e00bb3
Reviewed-on: https://code.wireshark.org/review/29940
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit d7546532d9c24ebe82627bbb10d4b3cc0fbf9d1e)
Reviewed-on: https://code.wireshark.org/review/29941
commit 066ab657c4
Author: Gerald Combs <[email protected]>
Date: Sun Sep 30 08:44:49 2018 +0000
[Automatic update for 2018-09-30]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: Ibf8f8b06fa1c21b2d5a380e0e45d42687c027126
Reviewed-on: https://code.wireshark.org/review/29933
Reviewed-by: Gerald Combs <[email protected]>
commit 5c81acc802
Author: Stig Bjørlykke <[email protected]>
Date: Sat Sep 29 00:00:19 2018 +0200
Qt: Show "unknown colorfilters" warning when opening the dialog
Show the warning about unknown colorfilters being disabled when
opening the "Coloring Rules..." dialog to make the user aware of
this before starting editing the rules.
The user may have corrected the filter and enabled it while having
the dialog open, and then this warning would be misleading.
Change-Id: Ic7f10495e5561bc2fea413c89cf9ebd187c8f113
Reviewed-on: https://code.wireshark.org/review/29909
Petri-Dish: Stig Bjørlykke <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <[email protected]>
(cherry picked from commit 45be9668223f3b42b45a6e30d67cb2eee94d2c5b)
Reviewed-on: https://code.wireshark.org/review/29919
Reviewed-by: Stig Bjørlykke <[email protected]>
commit 85ebd9e4da
Author: Stig Bjørlykke <[email protected]>
Date: Fri Sep 28 23:45:35 2018 +0200
prefs: Don't remove unknown coloring rules.
When saving the colorfilters file, keep and disable unknown coloring
rules instead of removing them. The user may want to correct the syntax.
Change-Id: Ib27612a0601276b6ebbb467d7d253f3f72103d1c
Reviewed-on: https://code.wireshark.org/review/29908
Petri-Dish: Stig Bjørlykke <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <[email protected]>
(cherry picked from commit b0dd361d4899ee6a3fda4ecbcee3d9b197c342be)
Reviewed-on: https://code.wireshark.org/review/29918
Reviewed-by: Stig Bjørlykke <[email protected]>
commit 64c63c51fd
Author: Stig Bjørlykke <[email protected]>
Date: Fri Sep 28 19:47:33 2018 +0200
prefs: Reset prefs.unknown_colorfilters before reading colorfilters
Reset prefs.unknown_colorfilters in the beginning of read_filters_file()
to avoid a situation when the preference is set and never cleared.
This will end up with an error message in UI even when not having
unknown color filters.
Change-Id: I835dbc2a57f0be6889eb5bce250987dabd796e30
Reviewed-on: https://code.wireshark.org/review/29904
Petri-Dish: Stig Bjørlykke <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <[email protected]>
(cherry picked from commit e804e63d4dc7fcf7893d32cd0c420f1736840aeb)
Reviewed-on: https://code.wireshark.org/review/29917
Reviewed-by: Stig Bjørlykke <[email protected]>
commit c3b0bcaed5
Author: moguz <[email protected]>
Date: Fri Sep 28 09:44:37 2018 -0700
PROFINET: ARServerblock is correctly dissected.
ARServerBlock function causes MalformedPacket error.
Padding in the function is fixed.
Change-Id: I498b1f15abcaab2a0be19096939fae5402747b68
Reviewed-on: https://code.wireshark.org/review/29899
Petri-Dish: Anders Broman <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
commit 9474283818
Author: Peter Wu <[email protected]>
Date: Tue Sep 25 15:52:37 2018 +0200
TLS: fix broken reassembly with multiple PDUs in the same frame
When (1) a frame has multiple TLS application data records and (2) two
of them request reassembly of a new PDU, then the second fragment would
be considered conflicting with the first one since the PDUs (MSPs) are
identified by the frame number of the starting frame.
This behavior was observed in a firefox-http2-frag.pcap
(attachment 16616) which uses tcp_dissect_pdus to trigger reassembly:
Frame 19: 8694 bytes on wire (69552 bits), 8694 bytes captured (69552 bits)
...
Transport Layer Security (8640 bytes)
TLSv1.3 Record Layer: Application Data Protocol: http2
SSL segment data (1369 bytes) <-- 7/7 last segment of previous PDU
SSL segment data (1203 bytes) <-- 1/5 first segment of new PDU
TLSv1.3 Record Layer: Application Data Protocol: http2
SSL segment data (1369 bytes) <-- 2/5
TLSv1.3 Record Layer: Application Data Protocol: http2
SSL segment data (1369 bytes) <-- 3/5
TLSv1.3 Record Layer: Application Data Protocol: http2
SSL segment data (1369 bytes) <-- 4/5
TLSv1.3 Record Layer: Application Data Protocol: http2
SSL segment data (976 bytes) <-- 5/5
TLSv1.3 Record Layer: Application Data Protocol: http2
SSL segment data (1369 bytes) <-- 1/? first segment of another PDU
[5 Reassembled TLS segments (6286 bytes): #19(1203), #19(1369), #19(1369), #19(1369), #19(976)]
[7 Reassembled TLS segments (8201 bytes): #17(1190), #17(1369), #17(1369), #18(1369), #18(1369), #18(1369), #19(166)]
HyperText Transfer Protocol 2 (8201 bytes, reassembled PDU)
Stream: DATA, Stream ID: 17, Length 8192 (partial entity body)
...
(7/7 finishes previous reassembly, see "7 Reassembled TLS segments")
HyperText Transfer Protocol 2 (1203 bytes, start of new PDU)
HyperText Transfer Protocol 2 (6286 bytes, reassembled PDU)
Stream: DATA, Stream ID: 17, Length 6277 (partial entity body)
...
(all fragments are in this frame, see "5 Reassembled TLS segments")
HyperText Transfer Protocol 2 (1369 bytes, start of another PDU)
[Reassembly error, protocol SSL: Frame already added in first pass]
TLS records for fragments 1/5 and 1/? both start a new PDU and would
thus invoke fragment_add with the same identifier. That results in the
Reassembly error which breaks further decryption. Reduce the probability
of this issue by mixing in the TLS stream position of the fragment.
Bug: 11173
Change-Id: I5536f3010b156555f1d7ae6dc98e08c030c8f771
Reviewed-on: https://code.wireshark.org/review/29871
Petri-Dish: Peter Wu <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit be16d87c60ae82eaef60da2bd4ce3597a05c1a30)
Reviewed-on: https://code.wireshark.org/review/29885
Reviewed-by: Peter Wu <[email protected]>
commit 1e9bd90dcf
Author: Guy Harris <[email protected]>
Date: Wed Sep 26 12:14:27 2018 -0700
pcapng: Free option_content on error
Change-Id: If95c6858370fdff795f5e568d0300fedb1a611ea
Reviewed-on: https://code.wireshark.org/review/29874
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit 77693bc6acf6a1682ffc24d9e65e8fab41f13e2e)
Reviewed-on: https://code.wireshark.org/review/29875
commit a15eecdc10
Author: Stig Bjørlykke <[email protected]>
Date: Wed Sep 26 20:04:35 2018 +0200
pcapng: Free option_content on error
Change-Id: I5a406ecf4e495d0224473d01af4144479ceaf9c3
Reviewed-on: https://code.wireshark.org/review/29863
Petri-Dish: Stig Bjørlykke <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <[email protected]>
(cherry picked from commit 65a422e235bd88859a27626f120a3d3ec478e29d)
Reviewed-on: https://code.wireshark.org/review/29872
Reviewed-by: Guy Harris <[email protected]>
commit e0a652cf20
Author: Guy Harris <[email protected]>
Date: Wed Sep 26 11:54:35 2018 -0700
Move wtap_encap_requires_phdr() amongs the other switch statement routines.
Keeping them together might increase the likelihood that all of them get
updated when a new pcap/pcapng link-layer type whose pseudo-header is
first processed here rather than by a dissector.
Change-Id: Ia6f45c38e9530b7c6a53d006fbc01b3040e9a014
Reviewed-on: https://code.wireshark.org/review/29868
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit e50e86c97427694812efd5ebada1a2c3bef9cb7c)
Reviewed-on: https://code.wireshark.org/review/29869
commit b5d51f2383
Author: Guy Harris <[email protected]>
Date: Tue Sep 25 16:20:00 2018 -0700
Get rid of unused flag argument.
We always tell pcap_process_pseudo_header() to check to make sure the
pseudo-header isn't bigger than the captured data; no need for a flag
argument to tell it to do so.
Change-Id: I8310bb06a390a7f4a7a232ad140ae07955d52da1
Reviewed-on: https://code.wireshark.org/review/29833
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit f9129721b2e504987484b8def3b56d9eae30b4db)
Reviewed-on: https://code.wireshark.org/review/29866
commit fc659b6125
Author: Guy Harris <[email protected]>
Date: Tue Sep 25 17:33:31 2018 -0700
Only use "libpcap" to refer to the library.
For file formats, say "pcap/pcapng" or "pcap and pcapng" instead; this
code handles both formats. Use just "pcap_" in structure types.
Change-Id: I2c0e096855ac3736bbfd72480ed4221b3a2f25d1
Reviewed-on: https://code.wireshark.org/review/29835
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit 5773f2bbca29b08dc1987478d8d4ee7ee24b7293)
Reviewed-on: https://code.wireshark.org/review/29861
commit d8f278829f
Author: Guy Harris <[email protected]>
Date: Wed Sep 26 10:52:25 2018 -0700
Sort cases in pcap_get_phdr_size(), add a missing one for WTAP_ENCAP_NFC_LLCP.
Sort the cases to match the order in other routines.
That turned up a missing case for WTAP_ENCAP_NFC_LLCP, so add it.
Change-Id: I500731322ae93c6d2efc368f16cf468f589910f3
Reviewed-on: https://code.wireshark.org/review/29858
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit 0a19ec761d68b4a52a4bbfe994503d3d09dbd245)
Reviewed-on: https://code.wireshark.org/review/29859
commit f6c23769ff
Author: Uli Heilmeier <[email protected]>
Date: Tue Sep 25 21:04:12 2018 +0200
PCP: Add padding for option
RFC 6887 states that options have to be padded to a multiple
of 4 octets. This commit adds missing padding.
Bug: 14950
Change-Id: I68a0631ecdd2f30e24e83b1a6e8dfc55856c9c94
Reviewed-on: https://code.wireshark.org/review/29832
Reviewed-by: Alexis La Goutte <[email protected]>
Petri-Dish: Alexis La Goutte <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <[email protected]>
(cherry picked from commit 1768252ef2c0aa7b7b0e728e752bb8422db2d323)
Reviewed-on: https://code.wireshark.org/review/29845
Petri-Dish: Anders Broman <[email protected]>
commit 6d998c0003
Author: Guy Harris <[email protected]>
Date: Tue Sep 25 20:21:25 2018 -0700
Handle the NFC LLCP pseudo-header when writing.
Write out the pseudo-header.
Change-Id: I7cab959ad9f3240580860cb91649d615fb49784e
Reviewed-on: https://code.wireshark.org/review/29842
Reviewed-by: Guy Harris <[email protected]>
commit 57de498494
Author: Gerald Combs <[email protected]>
Date: Mon Sep 24 11:02:11 2018 -0700
Netmon+Message Analyzer: Fix a couple of lengths.
Set the length of the Network Monitor Event and ETW Ndis protocols to
that of their respective headers instead of the remaining TVB length.
Add packet-netmon.c and packet-messageanalyzer.c to .editorconfig.
Change-Id: I50c23c63a74190cebf760fa6b374cc1b78c0191e
Reviewed-on: https://code.wireshark.org/review/29810
Reviewed-by: Gerald Combs <[email protected]>
Petri-Dish: Gerald Combs <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <[email protected]>
(cherry picked from commit ab53831abd962d4fc57e58fe3a7cc18c523c543c)
Reviewed-on: https://code.wireshark.org/review/29827
commit 5f425ea6dd
Author: Gerald Combs <[email protected]>
Date: Sun Sep 23 08:44:22 2018 +0000
[Automatic update for 2018-09-23]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: Id877add7e7f22052c556b3d0d44fc5c6795d2abe
Reviewed-on: https://code.wireshark.org/review/29791
Reviewed-by: Gerald Combs <[email protected]>
commit 334193717b
Author: Roland Knall <[email protected]>
Date: Fri Sep 21 14:35:03 2018 +0200
ProfiNet: Fix order in AssetManagment
According to the current Profinet specification in regard
to the coding of the AM_DeviceIdentification field, the
dissection order of DeviceId and VendorId is in the wrong
order.
Bug: 15140
Change-Id: I9954619a938db382967104de91e2b905677cc171
Reviewed-on: https://code.wireshark.org/review/29780
Petri-Dish: Roland Knall <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <[email protected]>
(cherry picked from commit 59c0a962f6aa414b6342a17e831d639d26ac9a85)
Reviewed-on: https://code.wireshark.org/review/29781
commit f5f3fdd79f
Author: Guy Harris <[email protected]>
Date: Thu Sep 20 22:27:22 2018 -0700
Get rid of unused variable, update a comment.
We no longer use red.libssh.org, so the file number isn't needed any
more.
Change-Id: I4cc6eb242eac51219742731cfa82a7bfe9fff2c3
Reviewed-on: https://code.wireshark.org/review/29771
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit b1afc67b9fd4755de8ab5a700f0158fa1c8b447e)
Reviewed-on: https://code.wireshark.org/review/29772
commit 1acdda22b6
Author: Guy Harris <[email protected]>
Date: Thu Sep 20 22:20:48 2018 -0700
Try downloading libssh directly from www.libssh.org.
Downloading from red.libssh.org got "curl: (51) SSL: no alternative
certificate subject name matches target host name 'red.libssh.org'" on
my Mojave virtual machine.
Change-Id: Iab8016c4dc5200c80bff3c0cdc776bc922f4dd59
Reviewed-on: https://code.wireshark.org/review/29768
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit 5a3ace1a25dbaacb721466b97952afae2f530373)
Reviewed-on: https://code.wireshark.org/review/29769
commit dc81d642a4
Author: Guy Harris <[email protected]>
Date: Thu Sep 20 21:43:10 2018 -0700
Update the URLs for GnuPG.
Use HTTP rather than FTP; the FTP server appears no longer to be
available.
Change-Id: I4446cc48818f419a341880da53db8670170794ae
Reviewed-on: https://code.wireshark.org/review/29765
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit d2347534dfe4be867c0971409beefb5202b36288)
Reviewed-on: https://code.wireshark.org/review/29766
commit f7f795194e
Author: Gerald Combs <[email protected]>
Date: Tue Sep 18 17:31:49 2018 -0700
make-manuf.py: Add response headers.
Add comments containing the resonse headers for the URLs we fetch.
standards-oui.ieee.org currently returns inconsistent results depending
on which host you happen to resolve.
Change-Id: I4adba7e51628d0350ba8e091523807ec85009700
Reviewed-on: https://code.wireshark.org/review/29730
Reviewed-by: Gerald Combs <[email protected]>
commit 4c11ef4edb
Author: Gerald Combs <[email protected]>
Date: Tue Sep 18 21:57:33 2018 +0000
update-tx: Fix our file list.
LUPDATE_FILES is a string, not an array.
Change-Id: Ibeef6fd45805f82eeff8c26f7110779603d9d30a
Reviewed-on: https://code.wireshark.org/review/29725
Reviewed-by: Gerald Combs <[email protected]>
commit 186cf94398
Author: Guy Harris <[email protected]>
Date: Mon Sep 17 15:21:03 2018 -0700
Make the maximum block size big enough for max-size D-Bus packets.
Change-Id: I352db07084294629160f16f6cf1e07f902a2844f
Reviewed-on: https://code.wireshark.org/review/29711
Reviewed-by: Guy Harris <[email protected]>
(cherry picked from commit f057a9dc55a9a171e6dc8dccbd6ba5f6cdcc3833)
Reviewed-on: https://code.wireshark.org/review/29712
commit d3681c5a6c
Author: Gerald Combs <[email protected]>
Date: Mon Sep 17 11:17:21 2018 -0700
make-manuf.py: Add back our user agent.
Change-Id: I39c54fa38c791f3244075b03a0045babc4f249ec
Reviewed-on: https://code.wireshark.org/review/29707
Reviewed-by: Gerald Combs <[email protected]>
commit 4fbc017e80
Author: João Valverde <[email protected]>
Date: Fri Sep 14 02:06:01 2018 +0100
CMake: Fix build from tarball under certain conditions
RPM target has a hard dependency on a git checkout. When building
from a tarbal the cmake step fails on systems with rpmbuild and git
installed. Make that failure more rare by testing for the presence
of a .git subfolder, which 99% of the time implies a working git VCS.
Change-Id: I9e035fd0b192ae0e0fbe98599799f19dbf31263d
Reviewed-on: https://code.wireshark.org/review/29653
Petri-Dish: João Valverde <[email protected]>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <[email protected]>
commit 05c9c6cadb
Author: Gerald Combs <[email protected]>
Date: Sun Sep 16 08:40:15 2018 +0000
[Automatic update for 2018-09-16]
Update manuf, services enterprise numbers, translations, and other items.
Change-Id: Iff8ce503b89cef7b9df5659ce3a80ab96824beec
Reviewed-on: https://code.wireshark.org/review/29680
Reviewed-by: Gerald Combs <[email protected]>
commit cd8c4063b4
Author: Gerald Combs <[email protected]>
Date: Fri Sep 14 17:41:28 2018 +0000
make-manuf.py: Improve truncation.
If the PyICU module is available, use it to truncate manufacturer
names by grapheme clusters.
Change-Id: Ib7dcbb126809df496a534f44a47871a1b28dc539
Reviewed-on: https://code.wireshark.org/review/29661
Reviewed-by: Gerald Combs <[email protected]>
commit fc956747a1
Author: Hannes Mezger <[email protected]>
Date: Thu Jul 12 18:35:08 2018 +0200
opcua: prevent opcua dissector crash by limiting nesting depth
The OPC UA types DiagnosticInfo, Variant and ExtensionObject can be
nested, which can lead to stack overflows when parsing specially
crafted packets. This is fixed by storing the current nesting depth
as expert info.
The corresponding CVE is https://cve.mitre.org/cgi-bin/cvename.cgi?name=2018-12086
The corresponding security bulletin of the OPC Foundation is https://opcfoundation-onlineapplications.org/faq/SecurityBulletins/OPC_Foundation_Security_Bulletin_CVE-2018-12086.pdf
Change-Id: I5f6da3a3e269f6db1b690b77470ddf60045bcedd