Commit graph

372 commits

Author SHA1 Message Date
Darien Spencer
78f04d4800 RNSAP: Parse transportLayerAddress and bindingID
Parse IPv4/v6 and UDP ports

Change-Id: I3cbab496b4c73c1d0a0dbc55be29add8eab60dea
Reviewed-on: https://code.wireshark.org/review/27773
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-24 12:43:39 +00:00
Darien Spencer
cd2d3dd645 NBAP: Fix style issues in .cnf
Removed empty lines and fixed indentations

Change-Id: I583110e87f4fcf76af66d3ed4c3907bf2caba327
Reviewed-on: https://code.wireshark.org/review/27774
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-24 11:59:06 +00:00
Darien Spencer
5ccac2b65a NBAP: Simplify private data API
Explicit getters/setters seems excessive and become
unmaintainable when the private data struct gets big, like in NBAP

Change-Id: I54d6eea327f1b393d9f80aafcbdd75080e10d50d
Reviewed-on: https://code.wireshark.org/review/27749
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-23 17:50:56 +00:00
Sam Cisneros
d9c70acaf4 RANAP: optimize a bit the heuristic checks
And explain the new conditions

Change-Id: I7061ef783bebc260370c16622b8811e7b109c520
Reviewed-on: https://code.wireshark.org/review/27727
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-23 07:34:08 +00:00
Sam Cisneros
da07094516 RNSAP over SCCP heuristic dissector
Change-Id: Ife0612b52e96f3b379783515486751a11e65e86c
Reviewed-on: https://code.wireshark.org/review/27721
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-23 07:33:33 +00:00
Pascal Quantin
ab53ddbdce NBAP: remove an unused expert info field
Change-Id: I1d90a81792d76a39532323ed53a187aeda1f231b
Reviewed-on: https://code.wireshark.org/review/27740
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-23 07:33:10 +00:00
Pascal Quantin
54ab26ad93 NBAP: remove a useless mask
Change-Id: Ic433e7f01394fb5d8229d04a7ddbfb52547676e8
Reviewed-on: https://code.wireshark.org/review/27739
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-23 07:32:43 +00:00
Pascal Quantin
54e6d5551e NBAP: optimize a bit the heuristic checks
Change-Id: Idbc0d8e87e3e91890de61449fab8bc70cbbb21f0
Reviewed-on: https://code.wireshark.org/review/27724
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-23 04:17:45 +00:00
Peter Wu
8fdaeb80e8 rnsap: fix use-after-free of "obj_id"
dissect_PrivateIEFieldValue could use "obj_id" after it was freed. Use
per-packet info instead of globals to avoid such dangling pointers and
erase any previous state to avoid interference in the same packet.

Change-Id: I7376210ef02a8e781b5a34858ae47d2254c74948
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4311
Reviewed-on: https://code.wireshark.org/review/27650
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Darien Spencer <cusneud@mail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-22 09:39:41 +00:00
Darien Spencer
2a9886bf09 RRC: Make the U-RNTI field filterable
U-RNTI is defined in ASN.1 as a 'SEQUENCE' of 2 numbers. this update
adds the U-RNTI field to the tree as a UINT32 with the value of the
numbers combined so it could be filtered.

Change-Id: I31e9f39a257aaf98c36eebb2cb7c33eb156a0e9f
Reviewed-on: https://code.wireshark.org/review/27566
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-17 21:22:13 +00:00
Роман Донченко
88f7dae986 pkcs1: recognize the ecdsa-with-SHA1 OID
Change-Id: I8c82086570032c862ec1ca6ea25b4e40d1bc3e78
Reviewed-on: https://code.wireshark.org/review/27589
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-05-17 05:02:52 +00:00
Vasil Velichkov
d0823e3920 GSM MAP: Dissect SM-RP-SMEA
According to 3GPP TS 29.002 this parameter contains an address field
which is encoded as defined in 3GPP TS 23.040.

Change-Id: If82a09e43729a90ede1619da34e50ed5d14e869a
Reviewed-on: https://code.wireshark.org/review/27569
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-16 18:07:59 +00:00
Alexis La Goutte
995b0bab09 ldap: fix issue found by PVS Studio (V1001)
The 'offset' variable is assigned but is not used until the end of the function

Change-Id: Ib626b81f78b1b59547f451952cbdfb1bf04d2205
Reviewed-on: https://code.wireshark.org/review/27507
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-16 04:15:34 +00:00
AndersBroman
d7ea76d1e5 x509: Add decoding of Userid
"0.9.2342.19200300.100.1.1" "id-userid"

Bug 14655
Change-Id: Ia5d9a5655f411fe47ec60ad897254adec2d28b47
Reviewed-on: https://code.wireshark.org/review/27564
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-15 17:10:33 +00:00
Guy Harris
afad14dcfe Get rid of some GTK+-only stuff.
Change-Id: I85806476246a567f747e3911e3d15716e9cfe06b
Reviewed-on: https://code.wireshark.org/review/27514
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-13 20:21:14 +00:00
Guy Harris
3a0dd69d04 Get rid of some GTK+-only stuff.
Change-Id: I841a1cdb637f37673466e4d065474c0f7e2dfc56
Reviewed-on: https://code.wireshark.org/review/27512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-13 19:46:45 +00:00
Karl Knoebl
9136c59fa1 IEC-61850 MMS INFO-Column extended with invokeID, domainID, itemID
Change-Id: Id4e31cdcba5fcbb8f5f9ce967b97049dc4bb3e72
Reviewed-on: https://code.wireshark.org/review/27143
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-06 16:07:40 +00:00
Gerald Combs
46b0099588 Remove a leftover Makefile.
Change-Id: I210a4fd8f77687c5d7050feedb1128df728b2f3b
Reviewed-on: https://code.wireshark.org/review/27057
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-02 23:39:15 +00:00
Pascal Quantin
0264b2fda6 F1AP: fix a typo in ASN.1 description
Change-Id: Ic24fddcff47615cbdee6811a195ee3e087bb9f03
Reviewed-on: https://code.wireshark.org/review/27142
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-25 08:06:11 +00:00
Alexis La Goutte
0de109ef57 x509ce: fix indent (use 2 spaces)
Change-Id: I48c74126a57945033dbe5c81c9bb92012af6c719
Reviewed-on: https://code.wireshark.org/review/27129
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-25 06:56:29 +00:00
Ivan Nardi
0e97450e61 Camel/Inap: add missing sub-trees
Change-Id: I4a0ad70d264914f9d407305ec8d577f79c92a095
Reviewed-on: https://code.wireshark.org/review/27091
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-23 10:36:35 +00:00
Ivan Nardi
119a497652 Camel: add sub-tree for OriginalCalledPartyID i.e.
Change-Id: Ic66ef080cbd3b911ebd93f3fca8bd08bf7203802
Reviewed-on: https://code.wireshark.org/review/27051
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-04-21 07:10:26 +00:00
Dario Lombardo
4a156da068 Remove autotools build system.
It has been replaced by cmake.

Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a
Reviewed-on: https://code.wireshark.org/review/26969
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-18 03:46:17 +00:00
Peter Wu
ccff21854d Forbid leading, duplicated and trailing dots in field names
In order to simplify the display filter scanner, try to restrict the use
of dots ('.') in field names. Forbid leading dots, does not affect
current dissectors. Fix '..' typo in fpp dissector and forbid it. Forbid
trailing dots after fixing dissectors: some of them just have an excess
dot, others are missing a name after the dot.

Change-Id: I6e58a04ef0306ee8c16fbf6a3cabb076d7fc69c9
Reviewed-on: https://code.wireshark.org/review/26967
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-16 15:44:08 +00:00
Alexis La Goutte
4fab4f678c x509ce: fix display of IPAddress when it is an IPv6 Address
According to RFC 5280 (Section 4.2.1.6. Subject Alternative Name), an
iPAddress can be either four (IPv4) or sixteen octets (IPv6).

Bug: 14603
Change-Id: I6894f78c8e3f2a1b10940379397c87bbf981d4d6
Reviewed-on: https://code.wireshark.org/review/26891
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
2018-04-14 05:42:28 +00:00
Guy Harris
0561501505 Fix the length of the payload of a private_1 or audio PES packet.
The length field's value doesn't include the length of the length field
itself.

Change-Id: Icd0cc2721a32212296929d248b9305b0f4a051e6
Reviewed-on: https://code.wireshark.org/review/26920
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-04-13 00:57:32 +00:00
Pascal Quantin
98826de8e5 LPP: fix a typo in ASN.1 file
Change-Id: Id3189b5617aff853d85029624d7e160d48dd1f36
Reviewed-on: https://code.wireshark.org/review/26896
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-11 21:14:27 +00:00
Pascal Quantin
74f7374e9f RRC: upgrade dissector to v15.2.0
Change-Id: I874466e05bbc1ff11c286078b482de2f27eccf8b
Reviewed-on: https://code.wireshark.org/review/26851
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-10 12:12:04 +00:00
Pascal Quantin
1839a43f25 X2AP: upgrade dissector to v15.1.0
Change-Id: I61867f0bcd8cff1d7469e3344b2fb21f5ed3bd77
Reviewed-on: https://code.wireshark.org/review/26787
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-07 14:12:17 +00:00
Pascal Quantin
4cc78e6fe4 S1AP: upgrade dissector to v15.1.0
Change-Id: Ib3728a35f3635b58da2a10736799fd825c34e58b
Reviewed-on: https://code.wireshark.org/review/26782
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-06 21:49:02 +00:00
Pascal Quantin
5d79a994df F1AP: upgrade dissector to v15.1.0
Change-Id: I82720a4d6a49f11165635e9cf76c6fbc1555188d
Reviewed-on: https://code.wireshark.org/review/26778
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-06 16:51:59 +00:00
Pascal Quantin
64d6a7b846 NR RRC: upgrade dissector to v15.1.0
Change-Id: If34d8627e8dee0e9dd7c1dc72701aec57df68853
Reviewed-on: https://code.wireshark.org/review/26774
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-04-06 11:29:02 +00:00
Pascal Quantin
5f5255ec54 LTE RRC: upgrade dissector to v15.1.0
Change-Id: If8447a010d967dbc58d520bfcc23fecb65f25ed9
Reviewed-on: https://code.wireshark.org/review/26739
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-04 14:30:05 +00:00
Pascal Quantin
45d77f3197 LPP: upgrade dissector to v14.5.1
Change-Id: If0044a46c1aef24fa3bf323eceb0bdf004d2a81b
Reviewed-on: https://code.wireshark.org/review/26738
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-04 13:39:28 +00:00
Eric Wang
2f18a32864 LPP: fix NRSRQ display
according to 3gpp 36133v1404, nrsrq value ranges from -34db to 2.5db
according to 3gpp 36355v1404, nrsrq reporting value ranges from 0 to 74

Change-Id: Ie5cc9880526ba6919785a8e355178ac08b34a1a0
Reviewed-on: https://code.wireshark.org/review/26707
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-02 19:43:32 +00:00
Pascal Quantin
c9904986f7 LPP: fix RSRP, NRSRP and NRSRQ inequalities
Change-Id: Idf3883b7a19bb7910e5762bc4caaad509d9a30a7
Reviewed-on: https://code.wireshark.org/review/26708
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-02 06:24:22 +00:00
Pascal Quantin
88267f38a8 LPPa: upgrade dissector to v14.4.0
Change-Id: Ia84124f5bd7bf7167fae5c431b69de76ca9073eb
Reviewed-on: https://code.wireshark.org/review/26684
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-29 23:00:03 +00:00
Pascal Quantin
4adb8e9f6a Kerberos: do not store empty keys
Bug: 14576
Change-Id: Ib52133a1b43e237f76f17a38d308407c0431d33e
Reviewed-on: https://code.wireshark.org/review/26672
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-28 14:03:48 +00:00
Guy Harris
494508f2d0 Clean up REPORT_DISSECTOR_BUG().
Have it take a format and argument list as arguments, and have the
formatting done inside the reporting code.  That way, we're not relying
on any particular wmem scope working.

If WIRESHARK_ABORT_ON_DISSECTOR_BUG is set, try to add the message to
the crash information (currently only supported in macOS), and print it
to the standard error, before crashing.  We won't necessarily have a
usable crash dump to analyze, so we can't rely on that to find the cause
of the crash.

Ping-Bug: 14490
Change-Id: I2b39169c45c84f2ada31efa1d413bd28c140f8f4
Reviewed-on: https://code.wireshark.org/review/26643
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-25 23:49:35 +00:00
Pascal Quantin
2e02b438cc NR-RRC: remove a redundant declaration
Change-Id: Iddc49443ea4534314ef39bae749ddafb135143ff
Reviewed-on: https://code.wireshark.org/review/26591
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-22 13:38:58 +00:00
Joakim Karlsson
83d028792a GPRSCDR: fix bitrates in EPCQoSInformation
Changed type for the bitrate fields, from signed32 to unsigned32.
This fixes the problem of getting "-1" values at G_MAXUINT32.

TS 32.298 refers to TS 29.212 regarding bitrates, in TS 29.212 the
corresponding AVPs are defined as Unsigned32.

Change-Id: I6e0083bf034c7254ab48ca3c2c405cc20f5d6394
Reviewed-on: https://code.wireshark.org/review/26585
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-21 10:44:54 +00:00
Pascal Quantin
c75d49719f X2AP: include packet-x2ap.h
This should solve the missing prototypes warnings

Change-Id: Iaf2ac6c0a151cfb614f76c4a6bb103e0210d3808
Reviewed-on: https://code.wireshark.org/review/26567
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-20 10:48:25 +00:00
Pavel Strnad
18cd454da9 S1AP: fix filtering on cell-ID
Filter does not work due to same shared short name for cell-id being used for two different asn.1 defintions
  cell-ID OCTET STRING,
  cell-ID CellIdentity,

Change-Id: I5921bc82d46f38d43f9083e41d3a0558821042eb
Reviewed-on: https://code.wireshark.org/review/26545
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pavel Strnad <pavel_strnad@hotmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-19 14:37:04 +00:00
Pascal Quantin
6280c153bb F1AP: initial dissector submission based on v15.0.0
Change-Id: Icf5c128119afa86efddb87e744f7aecb8bf71e09
Reviewed-on: https://code.wireshark.org/review/26506
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-16 19:10:25 +00:00
Joakim Karlsson
eb7181cb3c [GPRSCDR] Update to 3GPP TS 32.298 V15.1.0
Change-Id: Ib5dcd33b73a38009b541a29c1cf21fa7d825bf99
Reviewed-on: https://code.wireshark.org/review/26471
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-14 17:32:57 +00:00
Guy Harris
28da001090 Put a variable inside the block in which it's used.
Change-Id: I8fcd694924458c124b43734fe5ded42cdf2d0174
Reviewed-on: https://code.wireshark.org/review/26404
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-09 19:58:33 +00:00
Dario Lombardo
66a1fefac4 kerberos: remove leak (found by clang).
Change-Id: I70242960466b276cf9ffb62fda62dcb40c17c1fe
Reviewed-on: https://code.wireshark.org/review/26396
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-09 19:37:42 +00:00
AndersBroman
5c25e1b2c1 S1AP: EmergencyAreaIDListForRestart is not an extension IE.
Change-Id: I3dd623e1a2ec3005ee2c810492e4d0fad39ce1d0
Reviewed-on: https://code.wireshark.org/review/26364
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-08 14:44:02 +00:00
Dario Lombardo
692cef88c7 dissectors: more SPDX license convertions.
Change-Id: I96e1f1cdbaaf49d65705ecacc903f73cf0e47d7c
Reviewed-on: https://code.wireshark.org/review/26334
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2018-03-07 17:18:47 +00:00
Dario Lombardo
8a5385b9c9 More licenses converted to SPDX.
Change-Id: Id4f987dcdacf06622d70263f4659a4400e30dc39
Reviewed-on: https://code.wireshark.org/review/26332
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-03-07 13:35:49 +00:00