osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Tools: Update the usb.ids URL in make-usb.py. 

The canonical location for the usb.ids file is
http://www.linux-usb.org/usb.ids. Unfortunately that site isn't
accessible over HTTPS so we were using https://usb-ids.gowdy.us/usb.ids
instead. *That* site is down, so switch to the Linux USB project's
SourceForge repository URL, which appears to house the assets for
www.linux-usb.org, including the usb.ids file.


(cherry picked from commit 01d5e8ee51)
This commit is contained in:
Gerald Combs 2020-11-15 22:07:16 +00:00
parent df635a196b
commit 96d5d2b091
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/make-usb.py
View File

@ -13,14 +13,16 @@ import urllib.request, urllib.error, urllib.parse
MODE_IDLE = 0
MODE_VENDOR_PRODUCT = 1
MIN_VENDORS = 2900 # 2948 as of 2015-06-28
MIN_PRODUCTS = 15000 # 15415 as of 2015-06-28
MIN_VENDORS = 3400 # 3409 as of 2020-11-15
MIN_PRODUCTS = 20000 # 20361 as of 2020-11-15
mode = MODE_IDLE
# Grab from linux-usb.org
# The canonical location for the usb.ids file is http://www.linux-usb.org/usb.ids.
# As of November 2020 that site isn't available over HTTPS. Use what appears to
# be the source code repository for the site.
req_headers = { 'User-Agent': 'Wireshark make-usb' }
req = urllib.request.Request('https://usb-ids.gowdy.us/usb.ids', headers=req_headers)
req = urllib.request.Request('https://sourceforge.net/p/linux-usb/repo/HEAD/tree/trunk/htdocs/usb.ids?format=raw', headers=req_headers)
response = urllib.request.urlopen(req)
lines = response.read().decode('UTF-8', 'replace').splitlines()