taxonomy: add Samsung, iPhone, HTC, LG pcaps
pcaps for:
HTC One M9
iPhone 5
iPhone 6
LG E900 (Windows Phone)
LG G2X
Microsoft Surface RT
Nokia Lumia 920
Samsung Galaxy Nexus
Samsung Galaxy S4
Change-Id: I6d96a3acda100d21eac3e9494d2080394e0bfb03
diff --git a/taxonomy/Makefile b/taxonomy/Makefile
index 9f99572..1acd7b2 100644
--- a/taxonomy/Makefile
+++ b/taxonomy/Makefile
@@ -2,14 +2,12 @@
all: build
-test: pcaptest
+test: tax_signature
set -e; \
for d in $(wildcard tests/*_test.py); do \
PYTHONPATH=. $(PYTHON) $$d; \
done
-
-pcaptest: tax_signature
- PYTHONPATH=. python ./pcaptest.py
+ PYTHONPATH=. $(PYTHON) ./pcaptest.py
PREFIX=/usr
diff --git a/taxonomy/ethernet.py b/taxonomy/ethernet.py
index 3c72d7c..2cec4ac 100644
--- a/taxonomy/ethernet.py
+++ b/taxonomy/ethernet.py
@@ -145,6 +145,7 @@
'a8:06:00': ['samsung'],
'ac:36:13': ['samsung'],
'b0:df:3a': ['samsung'],
+ 'b0:ec:71': ['samsung'],
'b4:07:f9': ['samsung'],
'c0:bd:d1': ['samsung'],
'c4:42:02': ['samsung'],
diff --git a/taxonomy/pcaptest.py b/taxonomy/pcaptest.py
index bda2215..62ae7bc 100644
--- a/taxonomy/pcaptest.py
+++ b/taxonomy/pcaptest.py
@@ -11,6 +11,7 @@
# devices for which we have a pcap but have decided not to add
# to the database, generally because the device is not common
# enough.
+ ('Unknown', './testdata/pcaps/ASUS Transformer TF300 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/iPhone 2 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/iPhone 3 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/iPhone 3GS 2.4GHz.pcap'),
@@ -18,10 +19,14 @@
('Unknown', './testdata/pcaps/HTC Evo 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/HTC Thunderbolt 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Lenovo_T440_80211ac_2x2_Windows8_2_4_GHz.pcap'),
+ ('Unknown', './testdata/pcaps/LG E900 2.4GHz.pcap'),
+ ('Unknown', './testdata/pcaps/LG G2X 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/MediaTek MT7610U 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Motorola Droid 2 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Motorola Droid 3 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Nexus One 2.4GHz.pcap'),
+ ('Unknown', './testdata/pcaps/Nokia Lumia 920 2.4GHz.pcap'),
+ ('Unknown', './testdata/pcaps/Nokia Lumia 920 5GHz.pcap'),
('Unknown', './testdata/pcaps/Samsung Charge 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Samsung Captivate 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Samsung Continuum 2.4GHz.pcap'),
@@ -37,6 +42,7 @@
# work for these, instead we add them explicitly.
('iPad (1st/2nd gen)', './testdata/pcaps/iPad 1st gen 5GHz.pcap'),
('iPad (1st/2nd gen)', './testdata/pcaps/iPad 2nd gen 5GHz.pcap'),
+ ('iPhone 6/6+', './testdata/pcaps/iPhone 6 5GHz.pcap'),
('iPhone 6/6+', './testdata/pcaps/iPhone 6+ 5GHz.pcap'),
('iPhone 6s/6s+', './testdata/pcaps/iPhone 6s 2.4GHz.pcap'),
('iPhone 6s/6s+', './testdata/pcaps/iPhone 6s+ 2.4GHz.pcap'),
diff --git a/taxonomy/testdata/dhcp.leases b/taxonomy/testdata/dhcp.leases
index fe88a8b..cc99348 100644
--- a/taxonomy/testdata/dhcp.leases
+++ b/taxonomy/testdata/dhcp.leases
@@ -17,7 +17,9 @@
1432237016 84:8e:0c:99:48:d5 192.168.42.10 iPaad-Mini-2nd-gen *
1432237016 24:ab:81:e4:74:bc 192.168.42.11 iPhoone-4 *
1432237016 54:26:96:29:3e:39 192.168.42.12 iPhoone-5 *
+1432237016 54:26:96:27:8a:10 192.168.42.12 iPhoone-5 *
1432237016 f0:db:e2:5e:a3:1a 192.168.42.13 iPhoone-6 *
+1432237016 f0:db:e2:61:db:fa 192.168.42.13 iPhoone-6 *
1432237016 c8:85:50:e9:74:58 192.168.42.14 iPhoone-6+ *
1432237016 00:cd:fe:a7:47:96 192.168.42.15 iPhoone-6s *
1432237016 68:db:ca:37:10:d8 192.168.42.16 iPhoone-6s+ *
diff --git a/taxonomy/testdata/dhcp.signatures b/taxonomy/testdata/dhcp.signatures
index df24d22..21fae31 100644
--- a/taxonomy/testdata/dhcp.signatures
+++ b/taxonomy/testdata/dhcp.signatures
@@ -9,7 +9,9 @@
84:8e:0c:99:48:d5 1,3,6,15,119,252
24:ab:81:e4:74:bc 1,3,6,15,119,252
54:26:96:29:3e:39 1,3,6,15,119,252
+54:26:96:27:8a:10 1,3,6,15,119,252
f0:db:e2:5e:a3:1a 1,3,6,15,119,252
+f0:db:e2:61:db:fa 1,3,6,15,119,252
c8:85:50:e9:74:58 1,3,6,15,119,252
00:cd:fe:a7:47:96 1,3,6,15,119,252
68:db:ca:37:10:d8 1,3,6,15,119,252
diff --git a/taxonomy/testdata/pcaps/HTC One M9 5GHz.pcap b/taxonomy/testdata/pcaps/HTC One M9 5GHz.pcap
new file mode 100644
index 0000000..ba767a9
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC One M9 5GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG E900 2.4GHz.pcap b/taxonomy/testdata/pcaps/LG E900 2.4GHz.pcap
new file mode 100644
index 0000000..631748a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG E900 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/LG G2X 2.4GHz.pcap b/taxonomy/testdata/pcaps/LG G2X 2.4GHz.pcap
new file mode 100644
index 0000000..ea805ef
--- /dev/null
+++ b/taxonomy/testdata/pcaps/LG G2X 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Microsoft Surface RT 5GHz.pcap b/taxonomy/testdata/pcaps/Microsoft Surface RT 5GHz.pcap
new file mode 100644
index 0000000..a7e882d
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Microsoft Surface RT 5GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Nokia Lumia 920 2.4GHz.pcap b/taxonomy/testdata/pcaps/Nokia Lumia 920 2.4GHz.pcap
new file mode 100644
index 0000000..947cf5f
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Nokia Lumia 920 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Nokia Lumia 920 5GHz.pcap b/taxonomy/testdata/pcaps/Nokia Lumia 920 5GHz.pcap
new file mode 100644
index 0000000..b74b9cd
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Nokia Lumia 920 5GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 2.4GHz Android 4.0.4.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 2.4GHz Android 4.0.4.pcap
new file mode 100644
index 0000000..2ee57a7
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 2.4GHz Android 4.0.4.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 2.4GHz.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 2.4GHz.pcap
new file mode 100644
index 0000000..be7e918
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 5GHz Android 4.0.4.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 5GHz Android 4.0.4.pcap
new file mode 100644
index 0000000..2a0785d
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 5GHz Android 4.0.4.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 5GHz.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 5GHz.pcap
new file mode 100644
index 0000000..7507987
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Nexus 5GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz Android 4.4.2.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz Android 4.4.2.pcap
new file mode 100644
index 0000000..33f0fe8
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 2.4GHz Android 4.4.2.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz Android 4.4.2.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz Android 4.4.2.pcap
new file mode 100644
index 0000000..246e5ec
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy S4 5GHz Android 4.4.2.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/iPhone 5 2.4GHz.pcap b/taxonomy/testdata/pcaps/iPhone 5 2.4GHz.pcap
new file mode 100644
index 0000000..bc51c5a
--- /dev/null
+++ b/taxonomy/testdata/pcaps/iPhone 5 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/iPhone 6 5GHz.pcap b/taxonomy/testdata/pcaps/iPhone 6 5GHz.pcap
new file mode 100644
index 0000000..33c3839
--- /dev/null
+++ b/taxonomy/testdata/pcaps/iPhone 6 5GHz.pcap
Binary files differ
diff --git a/taxonomy/wifi.py b/taxonomy/wifi.py
index 3a57d2c..ebed08f 100644
--- a/taxonomy/wifi.py
+++ b/taxonomy/wifi.py
@@ -152,7 +152,7 @@
'wifi3|probe:0,1,50,3,45,221(0050f2,8),htcap:012c,htagg:03,htmcs:000000ff|assoc:0,1,50,48,45,221(0050f2,2),127,cap:0411,htcap:012c,htagg:03,htmcs:000000ff,extcap:00000a8201400000|oui:htc':
('WCN3680', 'HTC One M8', '2.4GHz'),
- 'wifi|probe:0,1,45,127,191,221(506f9a,16),221(0050f2,8),221(001018,2),htcap:0063,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:80080000|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(0050f2,2),htcap:0063,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:80080000|oui:htc':
+ 'wifi3|probe:0,1,45,127,107,191,221(506f9a,16),221(0050f2,8),221(001018,2),htcap:0063,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,intwrk:0f,extcap:0000088001400040|assoc:0,1,33,36,48,45,127,107,191,221(001018,2),221(0050f2,2),cap:0011,htcap:0063,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e009,intwrk:0f,extcap:0000088001400040|oui:htc':
('BCM4356', 'HTC One M9', '5GHz'),
'wifi3|probe:0,1,50,3,45,127,107,221(506f9a,16),221(0050f2,8),221(001018,2),htcap:1063,htagg:17,htmcs:000000ff,intwrk:0f,extcap:0000088001400040|assoc:0,1,50,33,36,45,127,107,221(001018,2),221(0050f2,2),cap:1421,htcap:1063,htagg:17,htmcs:000000ff,txpow:1309,intwrk:0f,extcap:000008800140|oui:htc':
('BCM4356', 'HTC One M9', '2.4GHz'),
@@ -384,10 +384,12 @@
'wifi3|probe:0,1,50,3,45,127,htcap:49ad,htagg:17,htmcs:0000ffff,extcap:0400000000000040|assoc:0,1,50,33,36,48,45,127,221(0050f2,2),cap:0431,htcap:49ad,htagg:17,htmcs:0000ffff,txpow:1407,extcap:0000000000000040|os:macos':
('BCM4360', 'MacBook Air late 2014 (A1466)', '2.4GHz'),
- 'wifi|probe:0,1,45,127,191,221(00904c,51),htcap:09ef,vhtcap:0f8259b2|assoc:0,1,33,36,48,45,127,191,221(00904c,51),221(0050f2,2),htcap:09ef,vhtcap:0f8259b2|os:macos':
+ 'wifi3|probe:0,1,45,127,191,221(00904c,51),htcap:09ef,htagg:17,htmcs:0000ffff,vhtcap:0f8259b2,vhtrxmcs:0000ffea,vhttxmcs:0000ffea,extcap:0000000000000040|assoc:0,1,33,36,48,45,127,191,221(00904c,51),221(0050f2,2),cap:0011,htcap:09ef,htagg:17,htmcs:0000ffff,vhtcap:0f8259b2,vhtrxmcs:0000ffea,vhttxmcs:0000ffea,txpow:e808,extcap:0000000000000040|os:macos':
('BCM4360', 'MacBook Pro early 2014 (A1502)', '5GHz'),
- 'wifi|probe:0,1,45,50,htcap:0102,htagg:03,htmcs:0000ffff|assoc:0,1,33,36,48,221(0050f2,2),45,htcap:010e,htagg:03,htmcs:0000ffff|oui:microsoft':
+ 'wifi3|probe:0,1,45,50,htcap:0102,htagg:03,htmcs:0000ffff|assoc:0,1,48,221(0050f2,2),45,cap:0011,htcap:010e,htagg:03,htmcs:0000ffff|oui:microsoft':
+ ('Marvell_88W8797', 'Microsoft Surface RT', '5GHz'),
+ 'wifi3|probe:0,1,45,50,htcap:0102,htagg:03,htmcs:0000ffff|assoc:0,1,33,36,48,221(0050f2,2),45,cap:0011,htcap:010e,htagg:03,htmcs:0000ffff|oui:microsoft':
('Marvell_88W8797', 'Microsoft Surface RT', '5GHz'),
'wifi3|probe:0,1,3,45,50,htcap:0102,htagg:03,htmcs:0000ffff|assoc:0,1,48,50,221(0050f2,2),45,cap:0411,htcap:012c,htagg:03,htmcs:0000ffff|oui:microsoft':
('Marvell_88W8797', 'Microsoft Surface RT', '2.4GHz'),
@@ -545,11 +547,21 @@
'wifi3|probe:0,1,50,3,45,htcap:0020,htagg:01,htmcs:000000ff|assoc:0,1,50,45,61,48,221(0050f2,2),cap:0411,htcap:0020,htagg:01,htmcs:000000ff|oui:murata':
('', 'Samsung Galaxy Mini', '2.4GHz'),
- 'wifi|probe:0,1,45,221(0050f2,4),221(001018,2),221(00904c,51),htcap:010c,wps:Galaxy_Nexus|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:010c':
+ 'wifi3|probe:0,1,45,3,221(0050f2,4),221(001018,2),221(00904c,51),htcap:010c,htagg:19,htmcs:000000ff,wps:Galaxy_Nexus|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0011,htcap:010c,htagg:19,htmcs:000000ff,txpow:0f09':
('BCM4330', 'Samsung Galaxy Nexus', '5GHz'),
- 'wifi|probe:0,1,50,45,3,221(001018,2),221(00904c,51),htcap:110c,htagg:19,htmcs:000000ff|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:110c,htagg:19,htmcs:000000ff|oui:samsung':
+ 'wifi3|probe:0,1,45,221(0050f2,4),221(001018,2),221(00904c,51),htcap:010c,htagg:19,htmcs:000000ff,wps:Galaxy_Nexus|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0011,htcap:010c,htagg:19,htmcs:000000ff,txpow:0f09':
+ ('BCM4330', 'Samsung Galaxy Nexus', '5GHz'),
+ 'wifi3|probe:0,1,45,3,221(0050f2,4),221(001018,2),221(00904c,51),htcap:000c,htagg:19,htmcs:000000ff,wps:_|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0011,htcap:000c,htagg:19,htmcs:000000ff,txpow:0f0a|oui:samsung':
+ ('BCM4330', 'Samsung Galaxy Nexus', '5GHz'),
+ 'wifi3|probe:0,1,45,3,221(0050f2,4),221(001018,2),221(00904c,51),htcap:000c,htagg:19,htmcs:000000ff,wps:_|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0011,htcap:000c,htagg:19,htmcs:000000ff,txpow:0f0a|oui:murata':
+ ('BCM4330', 'Samsung Galaxy Nexus', '5GHz'),
+ 'wifi3|probe:0,1,50,45,221(0050f2,4),221(001018,2),221(00904c,51),htcap:110c,htagg:19,htmcs:000000ff,wps:Galaxy_Nexus|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0431,htcap:110c,htagg:19,htmcs:000000ff,txpow:1209':
('BCM4330', 'Samsung Galaxy Nexus', '2.4GHz'),
- 'wifi|probe:0,1,50,45,3,221(0050f2,4),221(001018,2),221(00904c,51),htcap:110c,wps:Galaxy_Nexus|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),htcap:110c':
+ 'wifi3|probe:0,1,50,45,3,221(0050f2,4),221(001018,2),221(00904c,51),htcap:110c,htagg:19,htmcs:000000ff,wps:Galaxy_Nexus|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0431,htcap:110c,htagg:19,htmcs:000000ff,txpow:1209':
+ ('BCM4330', 'Samsung Galaxy Nexus', '2.4GHz'),
+ 'wifi3|probe:0,1,50,45,221(0050f2,4),221(001018,2),221(00904c,51),htcap:100c,htagg:19,htmcs:000000ff,wps:_|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0431,htcap:100c,htagg:19,htmcs:000000ff,txpow:120a|oui:samsung':
+ ('BCM4330', 'Samsung Galaxy Nexus', '2.4GHz'),
+ 'wifi3|probe:0,1,50,45,221(0050f2,4),221(001018,2),221(00904c,51),htcap:100c,htagg:19,htmcs:000000ff,wps:_|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0431,htcap:100c,htagg:19,htmcs:000000ff,txpow:120a|oui:murata':
('BCM4330', 'Samsung Galaxy Nexus', '2.4GHz'),
'wifi3|probe:0,1,45,3,221(001018,2),221(00904c,51),htcap:000c,htagg:19,htmcs:000000ff|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0111,htcap:000c,htagg:19,htmcs:000000ff,txpow:0f09|oui:samsung':
@@ -634,6 +646,10 @@
('BCM4335', 'Samsung Galaxy S4', '5GHz'),
'wifi3|probe:0,1,45,127,191,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:006f,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:0000080000000040|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(00904c,4),221(0050f2,2),cap:1111,htcap:006f,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e001,extcap:0000000000000040|oui:murata':
('BCM4335', 'Samsung Galaxy S4', '5GHz'),
+ 'wifi3|probe:0,1,3,45,127,191,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:006f,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:0000080000000040|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(00904c,4),221(0050f2,2),cap:0011,htcap:006f,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e001,extcap:0000000000000040|oui:samsung':
+ ('BCM4335', 'Samsung Galaxy S4', '5GHz'),
+ 'wifi3|probe:0,1,3,45,127,191,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:006f,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,extcap:0000080000000040|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(00904c,4),221(0050f2,2),cap:0011,htcap:006f,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e001,extcap:0000000000000040|oui:murata':
+ ('BCM4335', 'Samsung Galaxy S4', '5GHz'),
'wifi3|probe:0,1,45,127,107,191,221(506f9a,16),221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:006f,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,intwrk:0f,extcap:0000088000400040|assoc:0,1,33,36,48,45,127,107,191,221(001018,2),221(00904c,4),221(0050f2,2),cap:0011,htcap:006f,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e001,intwrk:0f,extcap:0000008000400040|oui:samsung':
('BCM4335', 'Samsung Galaxy S4', '5GHz'),
'wifi3|probe:0,1,45,127,107,191,221(506f9a,16),221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:006f,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,intwrk:0f,extcap:0000088000400040|assoc:0,1,33,36,48,45,127,107,191,221(001018,2),221(00904c,4),221(0050f2,2),cap:0011,htcap:006f,htagg:17,htmcs:000000ff,vhtcap:0f805832,vhtrxmcs:0000fffe,vhttxmcs:0000fffe,txpow:e001,intwrk:0f,extcap:0000008000400040|oui:murata':
@@ -646,6 +662,10 @@
('BCM4335', 'Samsung Galaxy S4', '2.4GHz'),
'wifi3|probe:0,1,50,3,45,127,107,221(506f9a,16),221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:102d,htagg:17,htmcs:000000ff,intwrk:0f,extcap:0000088000400040|assoc:0,1,33,36,48,50,45,127,107,221(001018,2),221(0050f2,2),cap:0431,htcap:102d,htagg:17,htmcs:000000ff,txpow:1201,intwrk:0f,extcap:000000800040|oui:murata':
('BCM4335', 'Samsung Galaxy S4', '2.4GHz'),
+ 'wifi3|probe:0,1,50,45,127,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:102d,htagg:17,htmcs:000000ff,extcap:0000080000000040|assoc:0,1,33,36,48,50,45,221(001018,2),221(0050f2,2),cap:0431,htcap:102d,htagg:17,htmcs:000000ff,txpow:1201|oui:samsung':
+ ('BCM4335', 'Samsung Galaxy S4', '2.4GHz'),
+ 'wifi3|probe:0,1,50,45,127,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:102d,htagg:17,htmcs:000000ff,extcap:0000080000000040|assoc:0,1,33,36,48,50,45,221(001018,2),221(0050f2,2),cap:0431,htcap:102d,htagg:17,htmcs:000000ff,txpow:1201|oui:murata':
+ ('BCM4335', 'Samsung Galaxy S4', '2.4GHz'),
'wifi3|probe:0,1,45,127,107,191,221(506f9a,16),221(00904c,4),221(0050f2,8),221(001018,2),htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,intwrk:0f,extcap:0000088001400040|assoc:0,1,33,36,48,45,127,107,191,221(00904c,4),221(001018,2),221(0050f2,2),cap:0011,htcap:006f,htagg:17,htmcs:0000ffff,vhtcap:0f815832,vhtrxmcs:0000fffa,vhttxmcs:0000fffa,txpow:e20b,intwrk:0f,extcap:0000088001400040|oui:samsung':
('BCM4354', 'Samsung Galaxy S5', '5GHz'),
