osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
48981 commits 23 branches 0 tags 1.3 GiB
Commit graph

48981 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jörg Mayer
61aced2d64 emem -> wmem 
svn path=/trunk/; revision=52069
 2013-09-15 17:50:35 +00:00
Jörg Mayer
98baf8ba18 Add help option 
List options one by one

svn path=/trunk/; revision=52068
 2013-09-15 17:50:18 +00:00
Martin Kaiser
ed321d62c3 emem -> wmem 
svn path=/trunk/; revision=52067
 2013-09-15 17:12:54 +00:00
Martin Kaiser
62c3c0e1f0 emem -> wmem 
svn path=/trunk/; revision=52066
 2013-09-15 16:53:11 +00:00
Anders Broman
4269f3065b Fix a typo 
svn path=/trunk/; revision=52065
 2013-09-15 16:49:06 +00:00
Anders Broman
516f145eaa Use "cheaper" length check. 
svn path=/trunk/; revision=52064
 2013-09-15 16:47:31 +00:00
Pascal Quantin
7850883904 emem -> wmem 
svn path=/trunk/; revision=52063
 2013-09-15 15:11:11 +00:00
Jörg Mayer
c5ffff76d8 Fix checkapi warnings (missing id) 
Replace Makefile.{am,nmake,common} that did not conform by
their asn1/c133/ version.

svn path=/trunk/; revision=52062
 2013-09-15 15:00:03 +00:00
Jörg Mayer
05ba7d3afc http://url is NOT a c++ style comment 
svn path=/trunk/; revision=52061
 2013-09-15 14:49:16 +00:00
Jörg Mayer
65ff43fada Finish asn1 emem -> wmem conversion. 
Left are snmp and those functions that don't have wmem equivalents.

svn path=/trunk/; revision=52060
 2013-09-15 14:37:46 +00:00
Jörg Mayer
c65459c729 emem -> wmem (don't forget about .cnf) 
svn path=/trunk/; revision=52058
 2013-09-15 14:33:38 +00:00
Gerald Combs
b936b046de [Automatic manuf, services and enterprise-numbers update for 2013-09-15] 
svn path=/trunk/; revision=52056
 2013-09-15 14:03:44 +00:00
Pascal Quantin
9486a3d974 More wmem conversion (leaving uat related functions aside) 
svn path=/trunk/; revision=52055
 2013-09-15 13:46:13 +00:00
Jörg Mayer
888650324b emem -> wmem 
svn path=/trunk/; revision=52054
 2013-09-15 13:24:14 +00:00
Pascal Quantin
868b345eea Convert a few more dissectors to wmem API 
svn path=/trunk/; revision=52053
 2013-09-15 10:29:49 +00:00
Pascal Quantin
07c29e74e9 Convert a few more dissectors to wmem API 
svn path=/trunk/; revision=52052
 2013-09-15 09:12:01 +00:00
Alexis La Goutte
eda53fd1b7 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9153 [PATCH trivial] Fix Application Data record parsing for TLS 1.1/1.2 and DTLS 1.0/1.2 
Using memcpy on overlapping memory has undefined behaviour (read: on GCC 4.8.1 this destroys the plaintext and invalidates the MAC).

This patch fixes parsing Application Data records for TLS 1.1 and 1.2 (while I am at it, also for DTLS 1.0/1.2) by using memmove instead of memcpy.

svn path=/trunk/; revision=52051
 2013-09-15 06:59:32 +00:00
Alexis La Goutte
89244b1ad0 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers 
Fix decryption of TLS_RSA_WITH_IDEA_CBC_SHA (0x0007)

Caught when iterating through all SSLv3 cipher suites.
TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 (0x0006) was another one that
could not be decrypted

svn path=/trunk/; revision=52050
 2013-09-15 06:59:19 +00:00
Alexis La Goutte
219d17145f From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers 
Add more TLS cipher suites (SEED, AES-GCM, ECC)

- cipher suites from `RFC 5246 - TLS 1.2`
- cipher suites 150-155 are taken from: RFC 4162 - SEED for TLS
- cipher suites 156-167 are taken from: RFC 5288 - AES-GCM Cipher suites
- cipher suites 49153-49177 are taken from: RFC 4492 - ECC for TLS
- cipher suites 49195-49202 are taken from RFC 5289 - ECC with SHA256/384 and AES GCM

svn path=/trunk/; revision=52049
 2013-09-15 06:59:07 +00:00
Alexis La Goutte
9ac2566d0a From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers 
Add support for Camellia ciphers

svn path=/trunk/; revision=52048
 2013-09-15 06:58:54 +00:00
Alexis La Goutte
cbf315b8ed From Tom Cook via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147 Long / short guard interval not properly read from IxVeriWave vwr files 
The short / long guard interval is located in a different spot than the current vwr reader looks.

svn path=/trunk/; revision=52047
 2013-09-15 06:58:41 +00:00
Evan Huus
be2ebb1934 Remove unused variables, fix typos. 
svn path=/trunk/; revision=52046
 2013-09-15 02:26:20 +00:00
Michael Mann
b38ee917b1 Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. 
The script didn't catch as many as I would have liked, but it's a start.

The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum.

svn path=/trunk/; revision=52045
 2013-09-15 01:48:30 +00:00
Martin Kaiser
a17cf67635 emem -> wmem 
svn path=/trunk/; revision=52044
 2013-09-14 18:30:43 +00:00
Martin Kaiser
c522d836a7 use generic editor modelines 
svn path=/trunk/; revision=52043
 2013-09-14 18:20:07 +00:00
Martin Kaiser
1fccb6a9e1 emem -> wmem 
svn path=/trunk/; revision=52042
 2013-09-14 18:16:43 +00:00
Martin Kaiser
17e350d4b0 TABs -> spaces 
add editor modelines

svn path=/trunk/; revision=52041
 2013-09-14 18:08:28 +00:00
Martin Kaiser
f1592c5846 emem -> wmem 
svn path=/trunk/; revision=52040
 2013-09-14 17:56:44 +00:00
Jörg Mayer
ec2fc7f0e7 emem -> wmem 
svn path=/trunk/; revision=52039
 2013-09-14 14:42:35 +00:00
Jörg Mayer
f737cea032 emem -> wmem 
svn path=/trunk/; revision=52038
 2013-09-14 14:33:04 +00:00
Evan Huus
7584f77567 Only access val_other if tlv_len is sufficiently long. Fixes 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9150

Also add modelines.

svn path=/trunk/; revision=52037
 2013-09-14 13:30:02 +00:00
Evan Huus
ef101edfa1 _lookup_extended takes a pointer to the key-pointer since it has to set the old 
key pointer value. _insert just takes the key-pointer, not a pointer to it.
Passing a pointer-to-a-pointer causes the outer pointer to be dereferenced as a
struct (when it in fact points to a pointer to struct) and leads to incorrect
behaviour and uninitialized/out-of-bounds memory accesses.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9139

svn path=/trunk/; revision=52036
 2013-09-14 13:15:31 +00:00
Jörg Mayer
9b5ab5c3e1 Add copyright (Michael, Joerg and Guy) and license (GPL2+) 
svn path=/trunk/; revision=52035
 2013-09-14 13:11:38 +00:00
Evan Huus
4535fd9b13 From Patrick Lundquist via 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7038

Fix a bug in Moldudp64 where offset + MOLDUDP64_MSGLEN_LEN was basically
subtracted twice from remaining packet length.

svn path=/trunk/; revision=52034
 2013-09-14 12:35:29 +00:00
Evan Huus
868a331c10 Add GPL license as per Anders' email. 
svn path=/trunk/; revision=52033
 2013-09-14 12:23:19 +00:00
Pascal Quantin
5635a1f8bb Revert to emem for uat 
svn path=/trunk/; revision=52032
 2013-09-14 11:56:45 +00:00
Pascal Quantin
074349264e Convert some dissectors to wmem (leaving uat-like memory with emem for now) 
svn path=/trunk/; revision=52031
 2013-09-14 10:53:29 +00:00
Jörg Mayer
f9faa339a5 Fix a typo 
svn path=/trunk/; revision=52030
 2013-09-14 07:00:52 +00:00
Gerald Combs
7b03b59598 Mis-use error bars to draw segments. 
svn path=/trunk/; revision=52029
 2013-09-13 23:34:34 +00:00
Evan Huus
f2f2d0e888 Add license header to colorfilters2js.pl as per email from Dirk. 
svn path=/trunk/; revision=52028
 2013-09-13 23:02:39 +00:00
Gerald Combs
7f92257af8 More TCP stream graph updates. 
Scan our segment list (and the capture file) once per stream. Switch the
stream selection control to a QSpinBox. Add graph type selection
actions. The context menu + shortcuts should now be complete. Add the
intitial tcptrace graph. Only ACKs and RWINs so far. A bunch of other
updates and fixes.

svn path=/trunk/; revision=52027
 2013-09-13 22:29:05 +00:00
Chris Maynard
956844f335 Update a link. 
svn path=/trunk/; revision=52026
 2013-09-13 21:59:24 +00:00
Guy Harris
170a70aafd Copyright notice (GPL, why not). 
svn path=/trunk/; revision=52025
 2013-09-13 21:40:19 +00:00
Jeff Morriss
a4882cdcfe Add WIRESHARK_APPDATA description to the rawshark and tshark man pages. 
svn path=/trunk/; revision=52024
 2013-09-13 21:15:29 +00:00
Jeff Morriss
d179a1b788 Move debian-setup.sh into tools/ 
svn path=/trunk/; revision=52023
 2013-09-13 21:06:08 +00:00
Chris Maynard
02cec4d51b Allow an alternate application data location as specified by the new environment variable, WIRESHARK_APPDATA (chosen instead of my originally proposed WS_APPDATA name since most other Wireshark-specific environment variables were already named with the WIRESHARK_ prefix). 
See also: http://www.wireshark.org/lists/wireshark-users/201309/msg00013.html

svn path=/trunk/; revision=52022
 2013-09-13 20:15:46 +00:00
Pascal Quantin
e078770856 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9047 : 
EPL: Dissection for WriteMultipleParameter, Node Alias, SDO/ASND structuring

svn path=/trunk/; revision=52021
 2013-09-13 19:27:53 +00:00
Evan Huus
863e056a9c cmake/TestFileOffsetBits also copied from an upstream with the appropriate 
license

svn path=/trunk/; revision=52020
 2013-09-13 18:40:15 +00:00
Evan Huus
b33c061cc5 Permit a bunch of 'combo' licenses (meaning GPL + something else we accept in 
the same file).

svn path=/trunk/; revision=52019
 2013-09-13 18:36:11 +00:00
Evan Huus
d0d4118263 Add license header (attributing to Jakub) for a few of the npl files. 
svn path=/trunk/; revision=52018
 2013-09-13 18:29:08 +00:00