Merge remote-tracking branch 'upstream/master'

.mailmap

@@ -312,6 +312,7 @@ Robert Cragie <[email protected]> Robert Cragie <[email protected]>
 Robert Grange <[email protected]> robioneknobi
 Roland Knall <[email protected]> Roland Knall <[email protected]>
 Roland Knall <[email protected]> Roland Knall <[email protected]>
+Roman Donchenko <[email protected]> <[email protected]>
 Ronen Boazi <[email protected]> Boazi <[email protected]>
 Ronnie Sahlberg <[email protected]> <[email protected]>
 Ross Jacobs <[email protected]> Ross <[email protected]>

AUTHORS

@@ -3946,7 +3946,6 @@ Paul Stath		<pstath[AT]axxcelera.com>
 DeCount			<aatrade[AT]libero.it>
 Andras Veres-Szentkiralyi <vsza[AT]vsza.hu>
 Jakob Hirsch 		<jh.wireshark-bugzilla[AT]plonk.de>
-Роман Донченко		<dpb[AT]corrigendum.ru>
 billyjeans		<billyjeans[AT]gmail.com>
 Evan Huus		<eapache[AT]gmail.com>
 Tom Cook		<tcook[AT]ixiacom.com>
@@ -5102,6 +5101,7 @@ Rene Nielsen		<rene.nielsen[AT]microchip.com>
 reno			<renovetrov[AT]gmail.com>
 Ric Li			<ricmli[AT]outlook.com>
 Ricardo Cristian Ramirez <r.cristian.ramirez[AT]gmail.com>
+Ricardo Reis		<ricardo.reis[AT]cobhamsatcom.com>
 Rich Coe		<richcoe2[AT]gmail.com>
 Richard E. Silverman	<res[AT]qoxp.net>
 Richard Kuemmel		<kuemmel.ric[AT]googlemail.com>
@@ -5278,6 +5278,7 @@ Thomas Vogt		<gitwiresharktv[AT]ist-einmalig.de>
 Thoren Grüttemeier	<TGruettemeier[AT]dspace.de>
 Tigran Mkrtchyan	<tigran.mkrtchyan[AT]desy.de>
 Tim (Thanh) Nguyen	<tnnguyen[AT]broadcom.com>
+Tim Bruylants		<tbr[AT]intopix.com>
 Tim Cuthbertson		<tim[AT]gfxmonk.net>
 Tim Furlong		<tim.furlong[AT]gmail.com>
 Tim Potter		<tim.potter[AT]viasat.com>

doc/Stratoshark_Release_Notes.adoc

@@ -27,6 +27,8 @@ If you or your organization would like to contribute or become a sponsor, please
 // Many other improvements have been made.
 // See the “New and Updated Features” section below for more details.
 
+// The following changes have been made since version 0.9.1:
+
 The following changes have been made since version 0.9.0:
 
 * The application icons have been updated.
@@ -39,6 +41,10 @@ The following changes have been made since version 0.9.0:
 //* cveidlink:2014-2486[]
 //* Stratoshark grabs your ID at 3 am, goes to Waffle House, and insults people.
 
+The following bugs have been fixed since version 0.9.1:
+
+* Stratoshark help message has Wiresharkisms in it. wsbuglink:20229[].
+
 The following bugs have been fixed since version 0.9.0:
 
 * Falco Bridge: Empty frame.protocols field. wsbuglink:20248[].

doc/man_pages/stratoshark.adoc

@@ -138,32 +138,6 @@ Example: *-b filesize:1000 -b files:5* results in a ring buffer of five files
 of size one megabyte each.
 --
 
-////
--B|--buffer-size  <capture buffer size>::
-+
---
-Set capture buffer size (in MiB, default is 2 MiB).  This is used by
-the capture driver to buffer packet data until that data can be written
-to disk.  If you encounter packet drops while capturing, try to increase
-this size.  Note that, while *Stratoshark* attempts to set the buffer size
-to 2 MiB by default, and can be told to set it to a larger value, the
-system or interface on which you're capturing might silently limit the
-capture buffer size to a lower value or raise it to a higher value.
-
-This is available on UNIX-compatible systems, such as Linux, macOS,
-\*BSD, Solaris, and AIX, with libpcap 1.0.0 or later, and on Windows.
-It is not available on UNIX-compatible systems with earlier versions of
-libpcap.
-
-This option can occur multiple times.  If used before the first
-occurrence of the *-i* option, it sets the default capture buffer size.
-If used after an *-i* option, it sets the capture buffer size for
-the interface specified by the last *-i* option occurring before
-this option.  If the capture buffer size is not set specifically,
-the default capture buffer size is used instead.
---
-////
-
 -c  <capture event count>::
 Set the maximum number of events to read when capturing live
 data. Acts the same as *-a events:*<capture event count>.
@@ -182,14 +156,10 @@ This option may be specified multiple times.  Note that Stratoshark
 currently only displays the first comment of a capture file.
 --
 
--D|--list-interfaces::
-Print a list of the interfaces on which *Stratoshark* can capture, and
-exit.  For each network interface, a number and an interface name,
-possibly followed by a text description of the interface, is printed.
-The interface name or the number can be supplied to the *-i* flag to
-specify an interface on which to capture.  The number can be useful on
-Windows systems, where the interfaces have long names that usually
-contain a GUID.
+-D|--list-sources::
+Print a list of the sources from which *Stratoshark* can capture, and exit.
+For each source, a number and a source name, possibly followed by a text description of the source, is printed.
+The source name or the number can be supplied to the *-i* flag to specify a source from which to capture.
 
 --display <X display to use>::
 Specifies the X display to use.  A hostname and screen (otherhost:0.0)
@@ -204,7 +174,7 @@ Set the capture filter expression.
 This option can occur multiple times.  If used before the first
 occurrence of the *-i* option, it sets the default capture filter expression.
 If used after an *-i* option, it sets the capture filter expression for
-the interface specified by the last *-i* option occurring before
+the source specified by the last *-i* option occurring before
 this option.  If the capture filter expression is not set specifically,
 the default capture filter expression is used if provided.
 
@@ -244,15 +214,15 @@ Print the version number and options and exit.
 -H::
 Hide the capture info dialog during live capture.
 
--i|--interface  <capture source>|-::
+-i|--source  <capture source>|-::
 +
 --
 Set the name of the capture source or pipe to use for live capture.
 
 Capture source names should match one of the names or numbers listed in "*stratoshark -D*" (described above).
 
-If no source is specified, *Stratoshark* searches the list of interfaces, choosing the first interface.
-If there are no interfaces at all, *Stratoshark* reports an error and doesn't start the capture.
+If no source is specified, *Stratoshark* searches the list of sources, choosing the first source.
+If there are no sources at all, *Stratoshark* reports an error and doesn't start the capture.
 
 Pipe names should be either the name of a FIFO (named pipe) or "-" to
 read data from the standard input.  On Windows systems, pipe names must be
@@ -263,28 +233,6 @@ Scap data must have the same endianness as the capturing host.
 This option can occur multiple times.
 --
 
-////
--I|--monitor-mode::
-+
---
-Put the interface in "monitor mode"; this is supported only on IEEE
-802.11 Wi-Fi interfaces, and supported only on some operating systems.
-
-Note that in monitor mode the adapter might disassociate from the
-network with which it's associated, so that you will not be able to use
-any wireless networks with that adapter.  This could prevent accessing
-files on a network server, or resolving host names or network addresses,
-if you are capturing in monitor mode and are not connected to another
-network with another adapter.
-
-This option can occur multiple times.  If used before the first
-occurrence of the *-i* option, it enables the monitor mode for all interfaces.
-If used after an *-i* option, it enables the monitor mode for
-the interface specified by the last *-i* option occurring before
-this option.
---
-////
-
 -j::
 Use after *-J* to change the behavior when no exact match is found for
 the filter.  With this option select the first event before.
@@ -302,25 +250,21 @@ the first event after that is selected.
 --
 Start the capture session immediately.  If the *-i* flag was
 specified, the capture uses the specified source.  Otherwise,
-*Stratoshark* searches the list of interfaces, the first source.
-If there are no interfaces, *Stratoshark* reports an error and doesn't start the capture.
+*Stratoshark* searches the list of sources and uses the first source.
+If there are no sources, *Stratoshark* reports an error and doesn't start the capture.
 --
 
 -l::
 Turn on automatic scrolling if the event display is being updated
 automatically as events arrive during a capture (as specified by the
 *-S* flag).
 
-////
 -L|--list-data-link-types::
 List the data link types supported by the interface and exit.
-////
 
-////
 --list-time-stamp-types::
 List time stamp types supported for the interface. If no time stamp type can be
 set, no time stamp types are listed.
-////
 
 -o  <preference/recent setting>::
 +
@@ -340,26 +284,6 @@ specify a user DLT from the command line, you would use
     -o "uat:user_dlts:\"User 0 (DLT=147)\",\"cops\",\"0\",\"\",\"0\",\"\""
 --
 
-////
--p|--no-promiscuous-mode::
-+
---
-__Don't__ put the interface into promiscuous mode.  Note that the
-interface might be in promiscuous mode for some other reason; hence,
-*-p* cannot be used to ensure that the only traffic that is captured is
-traffic sent to or from the machine on which *Stratoshark* is running,
-broadcast traffic, and multicast traffic to addresses received by that
-machine.
-
-This option can occur multiple times.  If used before the first
-occurrence of the *-i* option, no interface will be put into the
-promiscuous mode.
-If used after an *-i* option, the interface specified by the last *-i*
-option occurring before this option will not be put into the
-promiscuous mode.
---
-////
-
 -P <path setting>::
 +
 --
@@ -387,21 +311,6 @@ specified filter (which uses the syntax of display filters, rather than
 that of capture filters) to be applied to all events read from the
 capture file; events not matching the filter are discarded.
 
--s|--snapshot-length  <capture snaplen>::
-+
---
-Set the default snapshot length to use when capturing live data.
-No more than __snaplen__ bytes of each network event will be read into
-memory, or saved to disk.  A value of 0 specifies a snapshot length of
-262144, so that the full event is captured; this is the default.
-
-This option can occur multiple times.  If used before the first
-occurrence of the *-i* option, it sets the default snapshot length.
-If used after an *-i* option, it sets the snapshot length for
-the interface specified by the last *-i* option occurring before
-this option.  If the snapshot length is not set specifically,
-the default snapshot length is used if provided.
---
 
 -S::
 Automatically update the event display as events are coming in.
@@ -418,7 +327,7 @@ typically defaults to __%USERPROFILE%\AppData\Local\Temp__.
 --
 
 --time-stamp-type <type>::
-Change the interface's timestamp method. See --list-time-stamp-types.
+Change the sources's timestamp method. See --list-time-stamp-types.
 
 --update-interval  <interval>::
 Set the length of time in milliseconds between new event reports during
@@ -467,7 +376,7 @@ are the values that can be used.
 This option can occur multiple times.  If used before the first
 occurrence of the *-i* option, it sets the default capture link type.
 If used after an *-i* option, it sets the capture link type for
-the interface specified by the last *-i* option occurring before
+the source specified by the last *-i* option occurring before
 this option.  If the capture link type is not set specifically,
 the default capture link type is used if provided.
 --

epan/dissectors/asn1/pkcs1/packet-pkcs1-template.c

@@ -107,12 +107,18 @@ void proto_reg_handoff_pkcs1(void) {
 	register_ber_oid_dissector("1.3.101.112", dissect_ber_oid_NULL_callback, proto_pkcs1, "id-Ed25519");
 	register_ber_oid_dissector("1.3.101.113", dissect_ber_oid_NULL_callback, proto_pkcs1, "id-Ed448");
 
-	oid_add_from_string("secp192r1","1.2.840.10045.3.1.1");
+	/* Curve identifiers from SECG SEC 2 */
 	oid_add_from_string("sect163k1","1.3.132.0.1");
+	oid_add_from_string("sect163r1","1.3.132.0.2");
 	oid_add_from_string("sect163r2","1.3.132.0.15");
+	oid_add_from_string("secp192k1","1.3.132.0.31");
+	oid_add_from_string("secp192r1","1.2.840.10045.3.1.1");
+	oid_add_from_string("secp224k1","1.3.132.0.32");
 	oid_add_from_string("secp224r1","1.3.132.0.33");
 	oid_add_from_string("sect233k1","1.3.132.0.26");
 	oid_add_from_string("sect233r1","1.3.132.0.27");
+	oid_add_from_string("sect239k1","1.3.132.0.3");
+	oid_add_from_string("secp256k1","1.3.132.0.10");
 	oid_add_from_string("secp256r1","1.2.840.10045.3.1.7");
 	oid_add_from_string("sect283k1","1.3.132.0.16");
 	oid_add_from_string("sect283r1","1.3.132.0.17");

epan/dissectors/packet-oran.c

@@ -1406,17 +1406,19 @@ static void ext11_work_out_bundles(unsigned startPrbc,
         }
     }
 
-    /* Bundles not controlled by other extensions - just divide up range into bundles we have */
+    /* Case where bundles are not controlled by other extensions - just divide up range into bundles we have */
     else {
-        settings->num_bundles = (numPrbc+numBundPrb-1) / numBundPrb;
+        settings->num_bundles = (numPrbc+numBundPrb-1) / numBundPrb;   /* rounded up */
 
-        /* Don't overflow settings->bundles[] ! */
+        /* Don't overflow settings->bundles[] */
         settings->num_bundles = MIN(MAX_BFW_BUNDLES, settings->num_bundles);
 
+        /* For each bundle.. */
         for (uint32_t n=0; n < settings->num_bundles; n++) {
+            /* Allocate start and end */
             settings->bundles[n].start = startPrbc + n*numBundPrb;
-            settings->bundles[n].end =   settings->bundles[n].start + numBundPrb-1;
-            /* Does it go beyond the end? */
+            settings->bundles[n].end =   settings->bundles[n].start + numBundPrb - 1;
+            /* If would go beyond end of PRBs, limit and identify as orphan */
             if (settings->bundles[n].end > startPrbc+numPrbc) {
                 settings->bundles[n].end = startPrbc+numPrbc;
                 settings->bundles[n].is_orphan = true;

epan/dissectors/packet-pkcs1.c

@@ -685,12 +685,18 @@ void proto_reg_handoff_pkcs1(void) {
 	register_ber_oid_dissector("1.3.101.112", dissect_ber_oid_NULL_callback, proto_pkcs1, "id-Ed25519");
 	register_ber_oid_dissector("1.3.101.113", dissect_ber_oid_NULL_callback, proto_pkcs1, "id-Ed448");
 
-	oid_add_from_string("secp192r1","1.2.840.10045.3.1.1");
+	/* Curve identifiers from SECG SEC 2 */
 	oid_add_from_string("sect163k1","1.3.132.0.1");
+	oid_add_from_string("sect163r1","1.3.132.0.2");
 	oid_add_from_string("sect163r2","1.3.132.0.15");
+	oid_add_from_string("secp192k1","1.3.132.0.31");
+	oid_add_from_string("secp192r1","1.2.840.10045.3.1.1");
+	oid_add_from_string("secp224k1","1.3.132.0.32");
 	oid_add_from_string("secp224r1","1.3.132.0.33");
 	oid_add_from_string("sect233k1","1.3.132.0.26");
 	oid_add_from_string("sect233r1","1.3.132.0.27");
+	oid_add_from_string("sect239k1","1.3.132.0.3");
+	oid_add_from_string("secp256k1","1.3.132.0.10");
 	oid_add_from_string("secp256r1","1.2.840.10045.3.1.7");
 	oid_add_from_string("sect283k1","1.3.132.0.16");
 	oid_add_from_string("sect283r1","1.3.132.0.17");