taxonomy: v3 for Kindle Fire, iPod 5G
Update signatures for Amazon Kindle Fire (2011 edition)
and iPod Touch 5th gen to v3 format.
Add a signature for one variant of Samsung Galaxy Tab (1st gen)
with txpow values which are distinctive.
Add an alternate Samsung Galaxy S4 signature.
Add pcaps for a few more phones which are not yet known to be
common enough to add to the database.
Add OUIs for Amazon, HTC, Samsung.
Change-Id: I80437ac00fe832771d79321164e7687765dc9bfc
diff --git a/taxonomy/ethernet.py b/taxonomy/ethernet.py
index f277184..11bbdb9 100644
--- a/taxonomy/ethernet.py
+++ b/taxonomy/ethernet.py
@@ -25,6 +25,7 @@
database = {
'00:bb:3a': ['amazon'],
'10:ae:60': ['amazon'],
+ '28:ef:01': ['amazon'],
'74:75:48': ['amazon'],
'84:d6:d0': ['amazon'],
'a0:02:dc': ['amazon'],
@@ -52,6 +53,7 @@
'00:23:76': ['htc'],
'00:ee:bd': ['htc'],
+ '18:87:96': ['htc'],
'1c:b0:94': ['htc'],
'38:e7:d8': ['htc'],
'50:2e:5c': ['htc'],
@@ -138,6 +140,7 @@
'6c:83:36': ['samsung'],
'78:d6:f0': ['samsung'],
'80:65:6d': ['samsung'],
+ '84:25:db': ['samsung'],
'84:38:38': ['samsung'],
'88:32:9b': ['samsung'],
'8c:77:12': ['samsung'],
diff --git a/taxonomy/pcaptest.py b/taxonomy/pcaptest.py
index 363f327..fda85b8 100644
--- a/taxonomy/pcaptest.py
+++ b/taxonomy/pcaptest.py
@@ -21,6 +21,7 @@
('Unknown', './testdata/pcaps/HTC Inspire 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/HTC Sensation 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/HTC Thunderbolt 2.4GHz.pcap'),
+ ('Unknown', './testdata/pcaps/HTC Titan 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'),
@@ -35,8 +36,11 @@
('Unknown', './testdata/pcaps/Samsung Captivate 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Samsung Continuum 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Samsung Epic 2.4GHz.pcap'),
+ ('Unknown', './testdata/pcaps/Samsung Exhibit 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Samsung Fascinate 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Samsung Galaxy Tab 2 2.4GHz.pcap'),
+ ('Unknown', './testdata/pcaps/Samsung Infuse 2.4GHz.pcap'),
+ ('Unknown', './testdata/pcaps/Samsung Infuse 5GHz.pcap'),
('Unknown', './testdata/pcaps/Samsung Vibrant 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Sony Xperia Z5 2.4GHz.pcap'),
('Unknown', './testdata/pcaps/Sony Xperia Z5 5GHz.pcap'),
diff --git a/taxonomy/testdata/dhcp.leases b/taxonomy/testdata/dhcp.leases
index 6256fd5..c5565d4 100644
--- a/taxonomy/testdata/dhcp.leases
+++ b/taxonomy/testdata/dhcp.leases
@@ -43,3 +43,4 @@
1432237016 00:26:4a:c2:89:58 192.168.42.33 iPhoone-3GS
1432237016 74:c2:46:fc:bb:d6 192.168.42.34 AmazonDashButton
1432237016 04:0c:ce:cf:40:2c 192.168.42.34 MacbookAir2010
+1432237016 8c:2d:aa:9c:ce:0f 192.168.42.34 iPood-5
diff --git a/taxonomy/testdata/dhcp.signatures b/taxonomy/testdata/dhcp.signatures
index bb5fae6..b7e818a 100644
--- a/taxonomy/testdata/dhcp.signatures
+++ b/taxonomy/testdata/dhcp.signatures
@@ -35,3 +35,4 @@
00:26:4a:c2:89:58 1,3,6,15,119,252
74:c2:46:fc:bb:d6 1,3,6
04:0c:ce:cf:40:2c 1,3,6,15,119,95,252,44,46
+8c:2d:aa:9c:ce:0f 1,3,6,15,119,252
diff --git a/taxonomy/testdata/pcaps/Amazon Kindle Fire 2.4GHz alt.pcap "b/taxonomy/testdata/pcaps/Amazon Kindle Fire 7\" \0502011 edition\051 2.4GHz alt.pcap"
similarity index 100%
rename from taxonomy/testdata/pcaps/Amazon Kindle Fire 2.4GHz alt.pcap
rename to "taxonomy/testdata/pcaps/Amazon Kindle Fire 7\" \0502011 edition\051 2.4GHz alt.pcap"
Binary files differ
diff --git "a/taxonomy/testdata/pcaps/Amazon Kindle Fire 7\" \0502011 edition\051 2.4GHz alt2.pcap" "b/taxonomy/testdata/pcaps/Amazon Kindle Fire 7\" \0502011 edition\051 2.4GHz alt2.pcap"
new file mode 100644
index 0000000..78adc0f
--- /dev/null
+++ "b/taxonomy/testdata/pcaps/Amazon Kindle Fire 7\" \0502011 edition\051 2.4GHz alt2.pcap"
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Amazon Kindle Fire 2.4GHz.pcap "b/taxonomy/testdata/pcaps/Amazon Kindle Fire 7\" \0502011 edition\051 2.4GHz.pcap"
similarity index 100%
rename from taxonomy/testdata/pcaps/Amazon Kindle Fire 2.4GHz.pcap
rename to "taxonomy/testdata/pcaps/Amazon Kindle Fire 7\" \0502011 edition\051 2.4GHz.pcap"
Binary files differ
diff --git a/taxonomy/testdata/pcaps/HTC Titan 2.4GHz.pcap b/taxonomy/testdata/pcaps/HTC Titan 2.4GHz.pcap
new file mode 100644
index 0000000..cf27a76
--- /dev/null
+++ b/taxonomy/testdata/pcaps/HTC Titan 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Exhibit 2.4GHz.pcap b/taxonomy/testdata/pcaps/Samsung Exhibit 2.4GHz.pcap
new file mode 100644
index 0000000..93936a7
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Exhibit 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Tab 2.4GHz SCH-T849.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Tab 2.4GHz SCH-T849.pcap
new file mode 100644
index 0000000..914bf14
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Tab 2.4GHz SCH-T849.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Galaxy Tab 5GHz SCH-T849.pcap b/taxonomy/testdata/pcaps/Samsung Galaxy Tab 5GHz SCH-T849.pcap
new file mode 100644
index 0000000..5026b19
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Galaxy Tab 5GHz SCH-T849.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Infuse 2.4GHz.pcap b/taxonomy/testdata/pcaps/Samsung Infuse 2.4GHz.pcap
new file mode 100644
index 0000000..51040c9
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Infuse 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/Samsung Infuse 5GHz.pcap b/taxonomy/testdata/pcaps/Samsung Infuse 5GHz.pcap
new file mode 100644
index 0000000..bdec834
--- /dev/null
+++ b/taxonomy/testdata/pcaps/Samsung Infuse 5GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/iPod Touch 5th gen 2.4GHz.pcap b/taxonomy/testdata/pcaps/iPod Touch 5th gen 2.4GHz.pcap
new file mode 100644
index 0000000..eaba69b
--- /dev/null
+++ b/taxonomy/testdata/pcaps/iPod Touch 5th gen 2.4GHz.pcap
Binary files differ
diff --git a/taxonomy/testdata/pcaps/iPod Touch 5th gen 5GHz.pcap b/taxonomy/testdata/pcaps/iPod Touch 5th gen 5GHz.pcap
new file mode 100644
index 0000000..0aa8090
--- /dev/null
+++ b/taxonomy/testdata/pcaps/iPod Touch 5th gen 5GHz.pcap
Binary files differ
diff --git a/taxonomy/wifi.py b/taxonomy/wifi.py
index dad59aa..7790bc9 100644
--- a/taxonomy/wifi.py
+++ b/taxonomy/wifi.py
@@ -31,11 +31,8 @@
'wifi|probe:0,1,50,45,htcap:01ac,htagg:02,htmcs:0000ffff|assoc:0,1,50,48,221(0050f2,2),45,127,htcap:01ac,htagg:02,htmcs:0000ffff|os:kindle':
('', 'Amazon Kindle', '2.4GHz'),
- 'wifi|probe:0,1,50,3,45,221(0050f2,8),htcap:1130,htagg:18,htmcs:000000ff|assoc:0,1,50,48,45,221(0050f2,2),htcap:1130,htagg:18,htmcs:000000ff|oui:amazon':
- ('TI_WL1271', 'Amazon Kindle Fire', '2.4GHz'),
- 'wifi|probe:0,1,50|assoc:0,1,50,45,48,127,221(0050f2,2),htcap:1172,htagg:03,htmcs:000000ff|oui:amazon':
- ('', 'Amazon Kindle Fire', '2.4GHz'),
-
+ 'wifi3|probe:0,1,50,3,45,221(0050f2,8),htcap:1130,htagg:18,htmcs:000000ff|assoc:0,1,50,48,45,221(0050f2,2),cap:8431,htcap:1130,htagg:18,htmcs:000000ff|oui:amazon':
+ ('TI_WL1271', 'Amazon Kindle Fire 7" (2011 edition)', '2.4GHz'),
'wifi|probe:0,1,50,221(0050f2,4),221(506f9a,9),wps:KFASWI|assoc:0,1,50,45,127,221(0050f2,2),48,htcap:1172,htagg:03,htmcs:000000ff':
('', 'Amazon Kindle Fire 7" (2014 edition)', '2.4GHz'),
'wifi|probe:0,1,50,221(0050f2,4),221(506f9a,9),wps:KFFOWI|assoc:0,1,50,45,48,127,221(0050f2,2),htcap:1172,htagg:03,htmcs:000000ff':
@@ -331,7 +328,9 @@
'wifi3|probe:0,1,50,45,221(001018,2),221(00904c,51),htcap:180c,htagg:1b,htmcs:000000ff|assoc:0,1,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0431,htcap:180c,htagg:1b,htmcs:000000ff|os:ios':
('BCM4329', 'iPod Touch 4th gen', '2.4GHz'),
- 'wifi|probe:0,1,45,127,107,221(001018,2),221(00904c,51),221(0050f2,8),htcap:0062,htagg:1a,htmcs:000000ff,intwrk:0f,extcap:04000000|assoc:0,1,33,36,48,45,70,221(001018,2),221(00904c,51),221(0050f2,2),htcap:0062,htagg:1a,htmcs:000000ff|name:ipod':
+ 'wifi3|probe:0,1,50,3,45,127,107,221(001018,2),221(00904c,51),221(0050f2,8),htcap:0020,htagg:1a,htmcs:000000ff,intwrk:0f,extcap:00000004|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0431,htcap:0020,htagg:1a,htmcs:000000ff,txpow:1504|os:ios':
+ ('BCM4334', 'iPod Touch 5th gen', '5GHz'),
+ 'wifi3|probe:0,1,45,127,107,221(001018,2),221(00904c,51),221(0050f2,8),htcap:0062,htagg:1a,htmcs:000000ff,intwrk:0f,extcap:00000004|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0011,htcap:0062,htagg:1a,htmcs:000000ff,txpow:1706|os:ios':
('BCM4334', 'iPod Touch 5th gen', '2.4GHz'),
'wifi|probe:0,1,45,127,191,221(001018,2),221(00904c,51),221(00904c,4),221(0050f2,8),htcap:006f,vhtcap:0f805832|assoc:0,1,33,36,48,45,127,191,221(001018,2),221(00904c,4),221(0050f2,2),htcap:006f,vhtcap:0f805832|oui:lg':
@@ -671,6 +670,10 @@
('BCM4335', 'Samsung Galaxy S4', '5GHz'),
'wifi3|probe:0,1,3,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':
('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: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,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,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:samsung':
('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':
@@ -710,6 +713,15 @@
'wifi3|probe:0,1,50,3,45,127,221(00904c,4),221(0050f2,8),221(001018,2),htcap:002d,htagg:17,htmcs:0000ffff,extcap:0000088001400040|assoc:0,1,50,33,36,48,45,127,221(001018,2),221(0050f2,2),cap:1431,htcap:002d,htagg:17,htmcs:0000ffff,txpow:1402,extcap:0000088001400040|oui:murata':
('BCM4358', 'Samsung Galaxy S6', '2.4GHz'),
+ 'wifi3|probe:0,1,45,221(001018,2),221(00904c,51),htcap:082c,htagg:1b,htmcs:000000ff|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0011,htcap:082c,htagg:1b,htmcs:000000ff,txpow:0f08|oui:samsung':
+ ('BCM4329', 'Samsung Galaxy Tab', '5GHz'),
+ 'wifi3|probe:0,1,45,221(001018,2),221(00904c,51),htcap:082c,htagg:1b,htmcs:000000ff|assoc:0,1,33,36,48,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0011,htcap:082c,htagg:1b,htmcs:000000ff,txpow:0f08|oui:murata':
+ ('BCM4329', 'Samsung Galaxy Tab', '5GHz'),
+ 'wifi3|probe:0,1,50,45,221(001018,2),221(00904c,51),htcap:182c,htagg:1b,htmcs:000000ff|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0431,htcap:182c,htagg:1b,htmcs:000000ff,txpow:1208|oui:samsung':
+ ('BCM4329', 'Samsung Galaxy Tab', '2.4GHz'),
+ 'wifi3|probe:0,1,50,45,221(001018,2),221(00904c,51),htcap:182c,htagg:1b,htmcs:000000ff|assoc:0,1,33,36,48,50,45,221(001018,2),221(00904c,51),221(0050f2,2),cap:0431,htcap:182c,htagg:1b,htmcs:000000ff,txpow:1208|oui:murata':
+ ('BCM4329', 'Samsung Galaxy Tab', '2.4GHz'),
+
'wifi3|probe:0,1,45,50,htcap:0162,htagg:03,htmcs:00000000|assoc:0,1,48,127,221(0050f2,2),45,cap:0011,htcap:016e,htagg:03,htmcs:000000ff,extcap:0400000000000140|oui:samsung':
('Marvell_88W8787', 'Samsung Galaxy Tab 3', '5GHz'),
'wifi3|probe:0,1,45,50,htcap:0162,htagg:03,htmcs:00000000|assoc:0,1,48,127,221(0050f2,2),45,cap:0011,htcap:016e,htagg:03,htmcs:000000ff,extcap:0400000000000140|oui:murata':
