diff --git a/docs/user/include_jinja_list.md b/docs/user/include_jinja_list.md index 219e04db..d4627da2 100644 --- a/docs/user/include_jinja_list.md +++ b/docs/user/include_jinja_list.md @@ -53,7 +53,9 @@ | mac_type | netutils.mac.mac_type | | compare_type5 | netutils.password.compare_type5 | | compare_type7 | netutils.password.compare_type7 | +| decrypt_juniper | netutils.password.decrypt_juniper | | decrypt_type7 | netutils.password.decrypt_type7 | +| encrypt_juniper | netutils.password.encrypt_juniper | | encrypt_type5 | netutils.password.encrypt_type5 | | encrypt_type7 | netutils.password.encrypt_type7 | | get_hash_salt | netutils.password.get_hash_salt | diff --git a/netutils/data_files/oui_mappings.py b/netutils/data_files/oui_mappings.py index 0d080bc1..e9e772c6 100644 --- a/netutils/data_files/oui_mappings.py +++ b/netutils/data_files/oui_mappings.py @@ -3348,7 +3348,7 @@ "000d36": "Wu Han Routon Electronic Co., Ltd", "000d37": "WIPLUG", "000d38": "NISSIN INC.", - "000d39": "Network Electronics", + "000d39": "VPG Now Nevion", "000d3a": "Microsoft Corp.", "000d3b": "Microelectronics Technology Inc.", "000d3c": "i.Tech Dynamic Ltd", @@ -5163,7 +5163,7 @@ "001454": "Symwave", "001455": "Coder Electronics Corporation", "001456": "Edge Products", - "001457": "T-VIPS AS", + "001457": "Nevion", "001458": "HS Automatic ApS", "001459": "Moram Co., Ltd.", "00145a": "Westermo Neratec AG", @@ -5829,7 +5829,7 @@ "0016f3": "CAST Information Co., Ltd", "0016f4": "Eidicom Co., Ltd.", "0016f5": "Dalian Golden Hualu Digital Technology Co.,Ltd", - "0016f6": "Video Products Group", + "0016f6": "Network Electronics", "0016f7": "L-3 Communications, Aviation Recorders", "0016f8": "AVIQTECH TECHNOLOGY CO., LTD.", "0016f9": "CETRTA POT, d.o.o., Kranj", @@ -6122,7 +6122,7 @@ "001819": "Cisco Systems, Inc", "00181a": "AVerMedia Information Inc.", "00181b": "TaiJin Metal Co., Ltd.", - "00181c": "Exterity Limited", + "00181c": "VITEC", "00181d": "ASIA ELECTRONICS CO.,LTD", "00181e": "GDX Technologies Ltd.", "00181f": "Palmmicro Communications", @@ -10229,6 +10229,7 @@ "0035ff": "Texas Instruments", "003676": "ARRIS Group, Inc.", "0036be": "Northwest Towers", + "0036d7": "Keltron IOT Corp.", "0036f8": "Conti Temic microelectronic GmbH", "0036fe": "SuperVision", "00376d": "Murata Manufacturing Co., Ltd.", @@ -11288,7 +11289,7 @@ "0080b5": "UNITED NETWORKS INC.", "0080b6": "Mercury Systems – Trusted Mission Solutions, Inc. ", "0080b7": "STELLAR COMPUTER", - "0080b8": "DMG MORI B.U.G. CO., LTD.", + "0080b8": "DMG MORI Digital Co., LTD", "0080b9": "ARCHE TECHNOLIGIES INC.", "0080ba": "PTE, LTD", "0080bb": "HUGHES LAN SYSTEMS", @@ -13470,6 +13471,7 @@ "0830ce": "Fiberhome Telecommunication Technologies Co.,LTD", "08318b": "HUAWEI TECHNOLOGIES CO.,LTD", "0831a4": "Huawei Device Co., Ltd.", + "0833ed": "ASKEY COMPUTER CORP", "08351b": "Shenzhen Jialihua Electronic Technology Co., Ltd", "083571": "CASwell INC.", "0835b2": "CoreEdge Networks Co., Ltd", @@ -13710,6 +13712,7 @@ "08f7e9": "HRCP Research and Development Partnership", "08f80d": "IEEE Registration Authority", "08f8bc": "Apple, Inc.", + "08f9e0": "Espressif Inc.", "08fa28": "HUAWEI TECHNOLOGIES CO.,LTD", "08fa79": "vivo Mobile Communication Co., Ltd.", "08fae0": "Fohhn Audio AG", @@ -13754,6 +13757,7 @@ "0c2576": "LONGCHEER TELECOMMUNICATION LIMITED", "0c2724": "Cisco Systems, Inc", "0c2755": "Valuable Techologies Limited", + "0c298f": "Tesla,Inc.", "0c29ef": "Dell Inc.", "0c2a69": "electric imp, incorporated", "0c2a86": "Fiberhome Telecommunication Technologies Co.,LTD", @@ -13864,6 +13868,7 @@ "0c8610": "Juniper Networks", "0c8629": "IEEE Registration Authority", "0c86c7": "Limited", + "0c8772": "FUJIAN STAR-NET COMMUNICATION CO.,LTD", "0c8910": "Samsung Electronics Co.,Ltd", "0c8a87": "AgLogica Holdings, Inc", "0c8b7d": "Vizio, Inc", @@ -14058,6 +14063,8 @@ "1012fb": "Hangzhou Hikvision Digital Technology Co.,Ltd.", "101331": "Technicolor Delivery Technologies Belgium NV", "1013ee": "Justec International Technology INC.", + "1015c1": "Technology Co., Ltd.", + "101849": "WEIFANG GOERTEK ELECTRONICS CO.,LTD", "10189e": "Elmo Motion Control", "101965": "New H3C Technologies Co., Ltd", "101b54": "HUAWEI TECHNOLOGIES CO.,LTD", @@ -14387,6 +14394,7 @@ "14169d": "Cisco Systems, Inc", "14169e": "Wingtech Group (HongKong）Limited", "14172a": "Fiberhome Telecommunication Technologies Co.,LTD", + "141844": "Xenon Smart Teknoloji Ltd.", "141877": "Dell Inc.", "1418c3": "Intel Corporate", "141973": "Beijing Yunyi Times Technology Co.,Ltd", @@ -14415,6 +14423,7 @@ "142bd6": "Guangdong Appscomm Co.,Ltd", "142c78": "GooWi Wireless Technology Co., Limited", "142d27": "Hon Hai Precision Ind. Co.,Ltd.", + "142d41": "Silicon Laboratories", "142d4d": "Apple, Inc.", "142d79": "Fiberhome Telecommunication Technologies Co.,LTD", "142d8b": "Incipio Technologies, Inc", @@ -15491,6 +15500,7 @@ "208756": "SIEMENS AG", "2087ac": "AES motomation", "2087ec": "HUAWEI TECHNOLOGIES CO.,LTD", + "208810": "Dell Inc.", "20896f": "Fiberhome Telecommunication Technologies Co.,LTD", "208984": "CO., LTD. ", "208986": "zte corporation", @@ -15543,6 +15553,7 @@ "20b730": "TeconGroup, Inc", "20b780": "Toshiba Visual Solutions Corporation Co.,Ltd", "20b7c0": "OMICRON electronics GmbH", + "20b82b": "Sagemcom Broadband SAS", "20b868": "Motorola Mobility LLC, a Lenovo Company", "20ba36": "u-blox AG", "20bb76": "COL GIOVANNI PAOLO SpA", @@ -15592,6 +15603,7 @@ "20e09c": "Nokia", "20e2a8": "Apple, Inc.", "20e407": "Spark srl", + "20e46f": "vivo Mobile Communication Co., Ltd.", "20e52a": "NETGEAR", "20e564": "ARRIS Group, Inc.", "20e6df": "eero inc.", @@ -15720,6 +15732,7 @@ "24497b": "Innovative Converged Devices Inc", "244b03": "Samsung Electronics Co.,Ltd", "244b81": "Samsung Electronics Co.,Ltd", + "244bf1": "HUAWEI TECHNOLOGIES CO.,LTD", "244bfe": "ASUSTek COMPUTER INC.", "244c07": "HUAWEI TECHNOLOGIES CO.,LTD", "244cab": "Espressif Inc.", @@ -15761,6 +15774,7 @@ "2469a5": "HUAWEI TECHNOLOGIES CO.,LTD", "246aab": "IT-IS International", "246c60": "Huawei Device Co., Ltd.", + "246c84": "Cisco Systems, Inc", "246c8a": "YUKAI Engineering", "246e96": "Dell Inc.", "246f28": "Espressif Inc.", @@ -15850,7 +15864,7 @@ "24bcf8": "HUAWEI TECHNOLOGIES CO.,LTD", "24be05": "Hewlett Packard", "24be18": "DADOUTEK COMPANY LIMITED", - "24bf74": "Private", + "24bf74": "Hamamatsu Photonics K.K.", "24c0b3": "RSF", "24c17a": "BEIJING IACTIVE NETWORK CO.,LTD", "24c1bd": "CRRC DALIAN R&D CO.,LTD.", @@ -15890,6 +15904,7 @@ "24dbad": "ShopperTrak RCT Corporation", "24dbed": "Samsung Electronics Co.,Ltd", "24dc0f": "Phytium Technology Co.,Ltd.", + "24dcc3": "Espressif Inc.", "24dec6": "Aruba, a Hewlett Packard Enterprise Company", "24df6a": "HUAWEI TECHNOLOGIES CO.,LTD", "24dfa7": "Hangzhou BroadLink Technology Co.,Ltd", @@ -16069,6 +16084,7 @@ "287184": "Spire Payments", "2872c5": "Smartmatic Corp", "2872f0": "ATHENA", + "2873f6": "Amazon Technologies Inc.", "2874f5": "Nokia Solutions and Networks GmbH & Co. KG", "2875d8": "FUJIAN STAR-NET COMMUNICATION CO.,LTD", "287610": "IgniteNet", @@ -16225,6 +16241,7 @@ "28ea0b": "Microsoft Corporation", "28ea2d": "Apple, Inc.", "28eba6": "Nex-T LLC", + "28ec22": "eero inc.", "28ec95": "Apple, Inc.", "28ec9a": "Texas Instruments", "28ed58": "JAG Jakob AG", @@ -16342,6 +16359,7 @@ "2c3afd": "AVM Audiovisuelles Marketing und Computersysteme GmbH", "2c3b70": "AzureWave Technology Inc.", "2c3bfd": "Netstor Technology Co., Ltd.", + "2c3ebf": "HOSIN Global Electronics Co., Ltd.", "2c3ecf": "Cisco Systems, Inc", "2c3f0b": "Cisco Meraki", "2c3f38": "Cisco Systems, Inc", @@ -16610,6 +16628,7 @@ "301a30": "Mako Networks Ltd", "301aba": "GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD", "301b97": "Lierda Science & Technology Group Co.,Ltd", + "301d49": "Firmus Technologies Pty Ltd", "301f48": "zte corporation", "301f9a": "IEEE Registration Authority", "30215b": "Shenzhen Ostar Display Electronic Co.,Ltd", @@ -16783,6 +16802,7 @@ "30b1b5": "Arcadyan Corporation", "30b216": "Hitachi Energy Germany AG", "30b237": "GD Midea Air-Conditioning Equipment Co.,Ltd.", + "30b29f": "EVIDENT CORPORATION", "30b346": "CJSC NORSI-TRANS", "30b3a2": "Shenzhen Heguang Measurement & Control Technology Co.,Ltd", "30b49e": "TP-LINK TECHNOLOGIES CO.,LTD.", @@ -17042,6 +17062,7 @@ "34862a": "Heinz Lackmann GmbH & Co KG", "34865d": "Espressif Inc.", "34873d": "Quectel Wireless Solutions Co.,Ltd.", + "348818": "Cisco Systems, Inc", "34885d": "Logitech Far East", "348a12": "Aruba, a Hewlett Packard Enterprise Company", "348a7b": "Samsung Electronics Co.,Ltd", @@ -17141,6 +17162,7 @@ "34d262": "SZ DJI TECHNOLOGY CO.,LTD", "34d270": "Amazon Technologies Inc.", "34d2c4": "RENA GmbH Print Systeme", + "34d4e3": "Atom Power, Inc.", "34d693": "Huawei Device Co., Ltd.", "34d712": "Smartisan Digital Co., Ltd", "34d737": "IBG Industriebeteiligungsgesellschaft mbH &b Co. KG", @@ -17151,6 +17173,7 @@ "34dac1": "Co., Ltd.", "34db9c": "Sagemcom Broadband SAS", "34dbfd": "Cisco Systems, Inc", + "34dc99": "New H3C Technologies Co., Ltd", "34dd04": "Minut AB", "34dd7e": "Umeox Innovations Co.,Ltd", "34de1a": "Intel Corporate", @@ -17175,6 +17198,7 @@ "34e9fe": "Metis Co., Ltd.", "34ea34": "HangZhou Gubei Electronics Technology Co.,Ltd", "34eae7": "Shanghai High-Flying Electronics Technology Co., Ltd", + "34ecb6": "Phyplus Microelectronics Limited", "34ed0b": "Shanghai XZ-COM.CO.,Ltd.", "34ed1b": "Cisco Systems, Inc", "34ee2a": "ConMet", @@ -17587,6 +17611,7 @@ "3c2c99": "Edgecore Networks Corporation", "3c2ca6": "Beijing Xiaomi Electronics Co.,Ltd", "3c2db7": "Texas Instruments", + "3c2ef5": "Silicon Laboratories", "3c2ef9": "Apple, Inc.", "3c2eff": "Apple, Inc.", "3c2f3a": "SFORZATO Corp.", @@ -17807,6 +17832,7 @@ "3cdf1e": "Cisco Systems, Inc", "3cdfa9": "ARRIS Group, Inc.", "3cdfbd": "HUAWEI TECHNOLOGIES CO.,LTD", + "3ce002": "Texas Instruments", "3ce038": "Omnifi Inc.", "3ce064": "Texas Instruments", "3ce072": "Apple, Inc.", @@ -17825,6 +17851,7 @@ "3ceaf9": "JUBIXCOLTD", "3ceafb": "NSE AG", "3cecef": "Super Micro Computer, Inc.", + "3cef42": "TCT mobile ltd", "3cef8c": "Zhejiang Dahua Technology Co., Ltd.", "3cf011": "Intel Corporate", "3cf392": "Virtualtek. Co. Ltd", @@ -17867,6 +17894,7 @@ "4011dc": "Sonance", "4012e4": "Compass-EOS", "4013d9": "Global ES", + "401482": "Cisco Systems, Inc", "4014ad": "Huawei Device Co., Ltd.", "401597": "Protect America, Inc.", "40163b": "Samsung Electronics Co.,Ltd", @@ -17891,6 +17919,7 @@ "402619": "Apple, Inc.", "40270b": "Mobileeco Co., Ltd", "402814": "RFI Engineering", + "402a8f": "Shanghai High-Flying Electronics Technology Co., Ltd", "402b50": "ARRIS Group, Inc.", "402b69": "Kumho Electric Inc.", "402ba1": "Sony Corporation", @@ -18023,6 +18052,7 @@ "40987b": "Aisino Corporation", "4098ad": "Apple, Inc.", "409922": "AzureWave Technology Inc.", + "409a30": "TECNO MOBILE LIMITED", "409b0d": "Shenzhen Yourf Kwan Industrial Co., Ltd", "409b21": "Nokia", "409bcd": "D-Link International", @@ -18104,7 +18134,9 @@ "40d3ae": "Samsung Electronics Co.,Ltd", "40d40e": "Biodata Ltd", "40d4bd": "SK Networks Service CO., LTD.", + "40d4f6": "Honor Device Co., Ltd.", "40d559": "MICRO S.E.R.I.", + "40d563": "HANA Electronics", "40d63c": "Equitech Industrial(DongGuan)Co.,Ltd", "40d855": "IEEE Registration Authority", "40d95a": "AMPAK Technology,Inc.", @@ -18125,6 +18157,7 @@ "40eace": "FOUNDER BROADBAND NETWORK SERVICE CO.,LTD", "40ec99": "Intel Corporate", "40ecf8": "Siemens AG", + "40ed00": "TP-Link Corporation Limited", "40ed98": "IEEE Registration Authority", "40edcf": "Apple, Inc.", "40ee15": "Ltd.", @@ -18165,6 +18198,7 @@ "440377": "IEEE Registration Authority", "4403a7": "Cisco Systems, Inc", "440444": "GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD", + "44053f": "Sagemcom Broadband SAS", "4405e8": "twareLAB", "44070b": "Google, Inc.", "4409b8": "CO., LTD.", @@ -18529,6 +18563,7 @@ "482f6b": "Aruba, a Hewlett Packard Enterprise Company", "482fd7": "HUAWEI TECHNOLOGIES CO.,LTD", "483177": "Nintendo Co.,Ltd", + "4831b7": "Espressif Inc.", "4831db": "Huawei Device Co., Ltd.", "4833dd": "ZENNIO AVANCE Y TECNOLOGIA, S.L.", "48343d": "IEP GmbH", @@ -18550,6 +18585,7 @@ "484487": "Cisco SPVTG", "4844f7": "Samsung Electronics Co.,Ltd", "484520": "Intel Corporate", + "4845cf": "LLC Proizvodstvennaya Kompania TransService", "48468d": "Zepcam B.V.", "4846c1": "FN-LINK TECHNOLOGY LIMITED", "4846f1": "Uros Oy", @@ -18657,6 +18693,7 @@ "489153": "Weinmann Geräte für Medizin GmbH + Co. KG", "4891d5": "Cisco Systems, Inc", "4891f6": "Shenzhen Reach software technology CO.,LTD", + "4893dc": "UNIWAY INFOCOM PVT LTD", "489507": "GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD", "4898ca": "Sichuan AI-Link Technology Co., Ltd.", "489a42": "Technomate Ltd", @@ -19048,6 +19085,7 @@ "4cd0cb": "HUAWEI TECHNOLOGIES CO.,LTD", "4cd0dd": "HUAWEI TECHNOLOGIES CO.,LTD", "4cd1a1": "HUAWEI TECHNOLOGIES CO.,LTD", + "4cd2fb": "UNIONMAN TECHNOLOGY CO.,LTD", "4cd3af": "HMD Global Oy", "4cd577": "CHONGQING FUGUI ELECTRONICS CO.,LTD.", "4cd629": "HUAWEI TECHNOLOGIES CO.,LTD", @@ -19076,6 +19114,7 @@ "4ceb42": "Intel Corporate", "4cebbd": "CHONGQING FUGUI ELECTRONICS CO.,LTD.", "4cebd6": "Espressif Inc.", + "4cec0f": "Cisco Systems, Inc", "4cecef": "Soraa, Inc.", "4cedde": "ASKEY COMPUTER CORP", "4cedfb": "ASUSTek COMPUTER INC.", @@ -19306,6 +19345,7 @@ "508d6f": "CHAHOO Limited", "508e49": "Xiaomi Communications Co Ltd", "508f4c": "Xiaomi Communications Co Ltd", + "5091e3": "TP-Link Corporation Limited", "5092b9": "Samsung Electronics Co.,Ltd", "50934f": "Gradual Tecnologia Ltda.", "509551": "ARRIS Group, Inc.", @@ -19401,6 +19441,7 @@ "50e0ef": "Nokia", "50e14a": "Private", "50e24e": "zte corporation", + "50e538": "Hangzhou Hikvision Digital Technology Co.,Ltd.", "50e549": "GIGA-BYTE TECHNOLOGY CO.,LTD.", "50e636": "AVM Audiovisuelles Marketing und Computersysteme GmbH", "50e666": "Shenzhen Techtion Electronics Co., Ltd.", @@ -19467,6 +19508,7 @@ "541149": "vivo Mobile Communication Co., Ltd.", "541159": "Nettrix Information Industry co.LTD", "54115f": "Atamo Pty Ltd", + "5412cb": "HUAWEI TECHNOLOGIES CO.,LTD", "541310": "HUAWEI TECHNOLOGIES CO.,LTD", "541379": "Hon Hai Precision Ind. Co.,Ltd.", "541473": "Wingtech Group (HongKong）Limited", @@ -19505,6 +19547,7 @@ "542f8a": "TELLESCOM INDUSTRIA E COMERCIO EM TELECOMUNICACAO ", "543131": "Raster Vision Ltd", "5431d4": "TGW Mechanics GmbH", + "543204": "Espressif Inc.", "5432c7": "Apple, Inc.", "5433cb": "Apple, Inc.", "5434ef": "HUAWEI TECHNOLOGIES CO.,LTD", @@ -19732,6 +19775,7 @@ "54f6e2": "HUAWEI TECHNOLOGIES CO.,LTD", "54f82a": "u-blox AG", "54f876": "ABB AG", + "54f8f0": "Tesla Inc", "54fa3e": "Samsung Electronics Co.,Ltd", "54fa96": "Nokia Solutions and Networks GmbH & Co. KG", "54fb58": "WISEWARE, Lda", @@ -19802,6 +19846,7 @@ "58404e": "Apple, Inc.", "584120": "TP-LINK TECHNOLOGIES CO.,LTD.", "5842e4": "Baxter International Inc", + "5843ab": "GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD", "584498": "Xiaomi Communications Co Ltd", "58454c": "Ericsson AB", "58468f": "Koncar Electronics and Informatics", @@ -19825,6 +19870,7 @@ "5853c0": "Beijing Guang Runtong Technology Development Company co.,Ltd", "585595": "Apple, Inc.", "5855ca": "Apple, Inc.", + "58569f": "Cisco Systems, Inc", "5856c2": "HUAWEI TECHNOLOGIES CO.,LTD", "5856e8": "ARRIS Group, Inc.", "58570d": "Danfoss Solar Inverters", @@ -19956,6 +20002,7 @@ "58c876": "Information Technology Co., Ltd.", "58c935": "Chiun Mai Communication System, Inc", "58cb52": "Google, Inc.", + "58cdc9": "CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.", "58ce2a": "Intel Corporate", "58cf4b": "Lufkin Industries", "58cf79": "Espressif Inc.", @@ -20062,6 +20109,7 @@ "5c2623": "WaveLynx Technologies Corporation", "5c2763": "Itibia Technologies", "5c27d4": "Shenzhen Qihu Intelligent Technology Company Limited", + "5c2886": "Corporation", "5c2aef": "r2p Asia-Pacific Pty Ltd", "5c2bf5": "Vivint Wireless Inc. ", "5c2e59": "Samsung Electronics Co.,Ltd", @@ -20295,11 +20343,13 @@ "5ce3b6": "Fiberhome Telecommunication Technologies Co.,LTD", "5ce42a": "Intel Corporate", "5ce50c": "Beijing Xiaomi Mobile Software Co., Ltd", + "5ce688": "VECOS Europe B.V.", "5ce747": "HUAWEI TECHNOLOGIES CO.,LTD", "5ce7a0": "Nokia", "5ce7bf": "New Singularity International Technical Development Co.,Ltd", "5ce883": "HUAWEI TECHNOLOGIES CO.,LTD", "5ce8b7": "Oraimo Technology Limited", + "5ce8d3": "Signalinks Communication Technology Co., Ltd", "5ce8eb": "Samsung Electronics Co.,Ltd", "5ce91e": "Apple, Inc.", "5cea1d": "Hon Hai Precision Ind. Co.,Ltd.", @@ -20516,6 +20566,7 @@ "609217": "Apple, Inc.", "6092f5": "ARRIS Group, Inc.", "609316": "Apple, Inc.", + "609532": "Zebra Technologies Inc.", "6095bd": "Apple, Inc.", "6095ce": "IEEE Registration Authority", "609620": "Private", @@ -20611,6 +20662,7 @@ "60db15": "New H3C Technologies Co., Ltd", "60db2a": "HNS", "60db98": "Calix Inc.", + "60dc81": "AltoBeam Inc.", "60dd70": "Apple, Inc.", "60dd8e": "Intel Corporate", "60de35": "GITSN, Inc.", @@ -20699,6 +20751,7 @@ "641759": "Intellivision Holdings, LLC", "641a22": "Heliospectra AB", "641aba": "Dryad Networks GmbH", + "641c10": "Texas Instruments", "641c67": "DIGIBRAS INDUSTRIA DO BRASILS/A", "641cae": "Samsung Electronics Co.,Ltd", "641cb0": "Samsung Electronics Co.,Ltd", @@ -20736,6 +20789,7 @@ "6437a4": "TOKYOSHUHA CO.,LTD.", "643ab1": "Sichuan Tianyi Comheart Telecom Co.,LTD", "643aea": "Cisco Systems, Inc", + "643e0a": "HUAWEI TECHNOLOGIES CO.,LTD", "643e8c": "HUAWEI TECHNOLOGIES CO.,LTD", "643f5f": "Exablaze", "644212": "Shenzhen Water World Information Co.,Ltd.", @@ -20789,6 +20843,7 @@ "646624": "Sagemcom Broadband SAS", "6466b3": "TP-LINK TECHNOLOGIES CO.,LTD.", "646707": "Beijing Omnific Technology, Ltd.", + "6467cd": "HUAWEI TECHNOLOGIES CO.,LTD", "64680c": "Comtrend Corporation", "646876": "Edifier International", "64694e": "Texas Instruments", @@ -21005,6 +21060,7 @@ "6818d9": "Hill AFB - CAPRE Group", "68193f": "Digital Airways", "6819ac": "Guangzhou Xianyou Intelligent Technogoly CO., LTD", + "681a7c": "Sichuan Tianyi Comheart Telecom Co.,LTD", "681aa4": "Shenzhen Skyworth Digital Technology CO., Ltd", "681ab2": "zte corporation", "681bef": "HUAWEI TECHNOLOGIES CO.,LTD", @@ -21023,6 +21079,7 @@ "682737": "Samsung Electronics Co.,Ltd", "68275f": "zte corporation", "6828ba": "Dejai", + "6828cf": "Aruba, a Hewlett Packard Enterprise Company", "6828f6": "Vubiq Networks, Inc.", "6829dc": "Ficosa Electronics S.L.U.", "682c7b": "Cisco Systems, Inc", @@ -21099,6 +21156,7 @@ "686dbc": "Hangzhou Hikvision Digital Technology Co.,Ltd.", "686e23": "Wi3 Inc.", "686e48": "Prophet Electronic Technology Corp.,Ltd", + "687161": "Cisco Systems, Inc", "687251": "Ubiquiti Inc", "6872c3": "Samsung Electronics Co.,Ltd", "6872dc": "CETORY.TV Company Limited", @@ -21255,6 +21313,7 @@ "68ef43": "Apple, Inc.", "68efbd": "Cisco Systems, Inc", "68f06d": "ALONG INDUSTRIAL CO., LIMITED", + "68f0b5": "Honor Device Co., Ltd.", "68f0bc": "Shenzhen LiWiFi Technology Co., Ltd", "68f0d0": "SkyBell Technologies Inc.", "68f125": "Data Controls Inc.", @@ -21331,6 +21390,7 @@ "6c2995": "Intel Corporate", "6c29d2": "Cisco Systems, Inc", "6c2acb": "Paxton Access Ltd", + "6c2adf": "IEEE Registration Authority", "6c2b59": "Dell Inc.", "6c2c06": "OOO NPP Systemotechnika-NN", "6c2cdc": "Co.,Ltd", @@ -22025,6 +22085,7 @@ "744687": "Kingsignal Technology Co., Ltd.", "7446a0": "Hewlett Packard", "7446b3": "Texas Instruments", + "7449d2": "New H3C Technologies Co., Ltd", "744aa4": "zte corporation", "744be9": "EXPLORER HYPERTECH CO.,LTD", "744ca1": "Liteon Technology Corporation", @@ -22036,6 +22097,7 @@ "745327": "COMMSEN CO., LIMITED", "7453a8": "ACL Airshop BV", "745427": "SHENZHEN FAST TECHNOLOGIES CO.,LTD", + "74546b": "hangzhou zhiyi communication co., ltd", "74547d": "Cisco SPVTG", "745612": "ARRIS Group, Inc.", "74563c": "GIGA-BYTE TECHNOLOGY CO.,LTD.", @@ -22159,6 +22221,7 @@ "74a4a7": "QRS Music Technologies, Inc.", "74a4b5": "Powerleader Science and Technology Co. Ltd.", "74a528": "HUAWEI TECHNOLOGIES CO.,LTD", + "74a58c": "Texas Instruments", "74a6cd": "Apple, Inc.", "74a78e": "zte corporation", "74a7ea": "Amazon Technologies Inc.", @@ -22215,7 +22278,7 @@ "74d6e5": "Huawei Device Co., Ltd.", "74d6ea": "Texas Instruments", "74d713": "Huaqin Technology Co.,Ltd", - "74d7ca": "Panasonic Corporation Automotive", + "74d7ca": "Panasonic Automotive Systems Co.,Ltd", "74d83e": "Intel Corporate", "74d850": "Evrisko Systems", "74d873": "GUANGDONG GENIUS TECHNOLOGY CO., LTD.", @@ -22336,11 +22399,13 @@ "7828ca": "Sonos, Inc.", "7829ed": "ASKEY COMPUTER CORP", "782a79": "Sdn. Bhd.", + "782af8": "IETHCOM INFORMATION TECHNOLOGY CO., LTD.", "782b46": "Intel Corporate", "782b64": "Bose Corporation", "782bcb": "Dell Inc.", "782c29": "New H3C Technologies Co., Ltd", "782d7e": "TRENDnet, Inc.", + "782dad": "HUAWEI TECHNOLOGIES CO.,LTD", "782e56": "China Mobile Group Device Co.,Ltd.", "782eef": "Nokia Corporation", "782f17": "Xlab Co.,Ltd", @@ -22709,6 +22774,7 @@ "7c2edd": "Samsung Electronics Co.,Ltd", "7c2f80": "Gigaset Communications GmbH", "7c310e": "Cisco Systems, Inc", + "7c3180": "SMK corporation", "7c336e": "MEG Electronics Inc.", "7c33f9": "HUAWEI TECHNOLOGIES CO.,LTD", "7c3548": "Transcend Information", @@ -23133,6 +23199,7 @@ "807459": "K's Co.,Ltd.", "807484": "Limited", "80751f": "SKY UK LIMITED", + "807677": "hangzhou puwell cloud tech co., ltd.", "807693": "Newag SA", "8076c2": "GD Midea Air-Conditioning Equipment Co.,Ltd.", "8077a4": "TECNO MOBILE LIMITED", @@ -23151,6 +23218,7 @@ "807de3": "Chongqing Sichuan Instrument Microcircuit Co.LTD.", "807eb4": "Shenzhen SuperElectron Technology Co.,Ltd.", "807ff8": "Juniper Networks", + "80802c": "Fortinet, Inc.", "8081a5": "Co.,Ltd", "808223": "Apple, Inc.", "808287": "ATCOM Technology Co.Ltd.", @@ -23372,6 +23440,7 @@ "843b10": "LVSWITCHES INC.", "843c4c": "Robert Bosch SRL", "843dc6": "Cisco Systems, Inc", + "843e1d": "Hui Zhou Gaoshengda Technology Co.,LTD", "843e79": "Shenzhen Belon Technology CO.,LTD", "843e92": "HUAWEI TECHNOLOGIES CO.,LTD", "843f4e": "Tri-Tech Manufacturing, Inc.", @@ -23424,6 +23493,7 @@ "847127": "Silicon Laboratories", "84716a": "Huawei Device Co., Ltd.", "847207": "I&C Technology", + "847293": "Texas Instruments", "847303": "Corporation Ltd.", "84742a": "zte corporation", "847460": "zte corporation", @@ -23593,6 +23663,7 @@ "84f117": "Newseason", "84f129": "Metrascale Inc.", "84f147": "Cisco Systems, Inc", + "84f175": "Jiangxi Xunte Intelligent Terminal Co., Ltd", "84f1d0": "EHOOME IOT PRIVATE LIMITED", "84f3eb": "Espressif Inc.", "84f44c": "International Integrated Systems., Inc.", @@ -23663,6 +23734,7 @@ "882bd7": "ADDÉNERGIE TECHNOLOGIES", "882d53": "Co., Ltd.", "882e5a": "storONE", + "883037": "Juniper Networks", "88308a": "Murata Manufacturing Co., Ltd.", "883314": "Texas Instruments", "8833be": "Ivenix, Inc.", @@ -23678,6 +23750,7 @@ "883c93": "Alcatel-Lucent Enterprise", "883d24": "Google, Inc.", "883f0c": "system a.v. co., ltd.", + "883f37": "UHTEK CO., LTD.", "883f4a": "Texas Instruments", "883f99": "Siemens AG", "883fd3": "HUAWEI TECHNOLOGIES CO.,LTD", @@ -23923,6 +23996,7 @@ "88fd15": "LINEEYE CO., LTD", "88fed6": "ShangHai WangYong Software Co., Ltd.", "8c006d": "Apple, Inc.", + "8c02cd": "FUJIAN STAR-NET COMMUNICATION CO.,LTD", "8c02fa": "COMMANDO Networks Limited", "8c04ba": "Dell Inc.", "8c04ff": "Technicolor CH USA Inc.", @@ -24192,6 +24266,7 @@ "8cde99": "Comlab Inc.", "8cdee6": "Samsung Electronics Co.,Ltd", "8cdef9": "Beijing Xiaomi Mobile Software Co., Ltd", + "8cdf2c": "vivo Mobile Communication Co., Ltd.", "8cdf9d": "NEC Corporation", "8ce042": "vivo Mobile Communication Co., Ltd.", "8ce081": "zte corporation", @@ -24212,9 +24287,11 @@ "8cec4b": "Dell Inc.", "8cec7b": "Apple, Inc.", "8ceec6": "Precepscion Pty. Ltd.", + "8ceefd": "zte corporation", "8cf112": "Motorola Mobility LLC, a Lenovo Company", "8cf228": "MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.", "8cf319": "Siemens Industrial Automation Products Ltd., Chengdu", + "8cf3e7": "solidotech", "8cf681": "Silicon Laboratories", "8cf710": "AMPAK Technology, Inc.", "8cf773": "Nokia", @@ -24245,6 +24322,7 @@ "900372": "Longnan Junya Digital Technology Co. Ltd. ", "9003b7": "PARROT SA", "900628": "Samsung Electronics Co.,Ltd", + "9006f2": "Texas Instruments", "900917": "Far-sighted mobile", "9009d0": "Synology Incorporated", "9009df": "Intel Corporate", @@ -24313,9 +24391,11 @@ "90380c": "Espressif Inc.", "9038df": "Changzhou Tiannengbo System Co. Ltd.", "90395e": "Silicon Laboratories", + "90395f": "Amazon Technologies Inc.", "903a72": "Ruckus Wireless", "903aa0": "Nokia", "903ae6": "PARROT SA", + "903c1d": "HISENSE VISUAL TECHNOLOGY CO.,LTD", "903c92": "Apple, Inc.", "903cae": "Yunnan KSEC Digital Technology Co.,Ltd.", "903cb3": "Edgecore Networks Corporation", @@ -24379,6 +24459,7 @@ "906aeb": "Microsoft Corporation", "906cac": "Fortinet, Inc.", "906d05": "BXB ELECTRONICS CO., LTD", + "906d62": "Cambium Networks Limited", "906dc8": "DLG Automação Industrial Ltda", "906ebb": "Hon Hai Precision Ind. Co.,Ltd.", "906f18": "Private", @@ -24419,6 +24500,7 @@ "90848b": "HDR10+ Technologies, LLC", "908674": "Sichuan Tianyi Comheart Telecom Co.,LTD", "90869b": "zte corporation", + "908855": "Cisco Systems, Inc", "9088a2": "IONICS TECHNOLOGY ME LTDA", "90895f": "WEIFANG GOERTEK ELECTRONICS CO.,LTD", "908c09": "Total Phase", @@ -24541,6 +24623,7 @@ "90e95e": "Cisco Systems, Inc", "90ea60": "SPI Lasers Ltd ", "90eb48": "Shanghai XinMiaoLink Technology Co., Ltd", + "90eb50": "Cisco Systems, Inc", "90ec50": "C.O.B.O. SPA", "90ec77": "silicom", "90ecea": "Apple, Inc.", @@ -24655,6 +24738,7 @@ "944444": "LG Innotek", "944452": "Belkin International Inc.", "944696": "BaudTec Corporation", + "944788": "HUAWEI TECHNOLOGIES CO.,LTD", "9447b0": "BEIJING ESWIN COMPUTING TECHNOLOGY CO., LTD", "944996": "WiSilica Inc", "944a09": "BitWise Controls", @@ -24702,6 +24786,7 @@ "9476b7": "Samsung Electronics Co.,Ltd", "94772b": "HUAWEI TECHNOLOGIES CO.,LTD", "947806": "NINGBO SUNVOT TECHNOLOGY CO.,LTD", + "947918": "ITEL MOBILE LIMITED", "947bae": "Xiaomi Communications Co Ltd", "947bbe": "Ubicquia LLC", "947be7": "Samsung Electronics Co.,Ltd", @@ -24903,6 +24988,7 @@ "9801a7": "Apple, Inc.", "980284": "Theobroma Systems GmbH", "9802d8": "IEEE Registration Authority", + "98038a": "Texas Instruments", "98039b": "Mellanox Technologies, Inc.", "9803a0": "ABB n.v. Power Quality Products", "9803d8": "Apple, Inc.", @@ -25080,6 +25166,7 @@ "989d5d": "Technicolor CH USA Inc.", "989de5": "Hangzhou Hikvision Digital Technology Co.,Ltd.", "989e63": "Apple, Inc.", + "989f1e": "HUAWEI TECHNOLOGIES CO.,LTD", "98a2c0": "Cisco Systems, Inc", "98a404": "Ericsson AB", "98a40e": "Snap, Inc.", @@ -25127,6 +25214,7 @@ "98cc4d": "Shenzhen mantunsci co., LTD", "98ccd9": "Shenzhen SuperElectron Technology Co.,Ltd.", "98cce4": "Shenzhen Mindray Animal Medical Technology Co.,LTD", + "98ccf3": "Amazon Technologies Inc.", "98cdac": "Espressif Inc.", "98cdb4": "Virident Systems, Inc.", "98cf53": "BBK EDUCATIONAL ELECTRONICS CORP.,LTD.", @@ -25187,6 +25275,7 @@ "98faa7": "INNONET", "98fae3": "Xiaomi Communications Co Ltd", "98fb12": "Ltd", + "98fbf5": "ATRALTECH", "98fc11": "Cisco-Linksys, LLC", "98fc84": "IEEE Registration Authority", "98fd74": "ACT.CO.LTD", @@ -25502,6 +25591,7 @@ "9cf8db": "shenzhen eyunmei technology co,.ltd", "9cf938": "AREVA NP GmbH", "9cfa3c": "Daeyoung Electronics", + "9cfb77": "GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD", "9cfbd5": "vivo Mobile Communication Co., Ltd.", "9cfbf1": "MESOMATIC GmbH & Co.KG", "9cfc01": "Apple, Inc.", @@ -25637,6 +25727,7 @@ "a0648f": "ASKEY COMPUTER CORP", "a06518": "VNPT TECHNOLOGY", "a06610": "FUJITSU LIMITED", + "a06636": "Intracom SA Telecom Solutions", "a06720": "China Dragon Technology Limited", "a067be": "Sicon srl", "a0681c": "GD Midea Air-Conditioning Equipment Co.,Ltd.", @@ -26208,6 +26299,7 @@ "a825eb": "Co.,Ltd.", "a826d9": "HTC Corporation", "a8294c": "Precision Optical Transceivers, Inc.", + "a82ad6": "Arthrex Inc.", "a82bb5": "Edgecore Networks Corporation", "a82bb9": "Samsung Electronics Co.,Ltd", "a82bcd": "HUAWEI TECHNOLOGIES CO.,LTD", @@ -26227,6 +26319,7 @@ "a83b76": "CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.", "a83ccb": "ROSSMA", "a83e0e": "HMD Global Oy", + "a83ed3": "HUAWEI TECHNOLOGIES CO.,LTD", "a83fa1": "IEEE Registration Authority", "a8400b": "Visteon Corporation", "a84025": "Oxide Computer Company", @@ -26461,6 +26554,7 @@ "aa0004": "DIGITAL EQUIPMENT CORPORATION", "ac007a": "Apple, Inc.", "ac00d0": "zte corporation", + "ac00f9": "Sdn. Bhd.", "ac0142": "Uriel Technologies SIA", "ac02ca": "HI Solutions, Inc.", "ac02cf": "RW Tecnologia Industria e Comercio Ltda", @@ -26544,6 +26638,7 @@ "ac3fa4": "TAIYO YUDEN CO.,LTD", "ac40ea": "C&T Solution Inc. ", "ac4122": "Eclipse Electronic Systems Inc.", + "ac416a": "Amazon Technologies Inc.", "ac4228": "Parta Networks", "ac4330": "Versa Networks", "ac44f2": "YAMAHA CORPORATION", @@ -26757,6 +26852,7 @@ "acd618": "Co., Ltd", "acd657": "Shaanxi GuoLian Digital TV Technology Co.,Ltd.", "acd829": "Co., Ltd.", + "acd8a7": "BELLDESIGN Inc.", "acd9d6": "tci GmbH", "acdb48": "ARRIS Group, Inc.", "acdbda": "Shenzhen Geniatech Inc, Ltd", @@ -26861,7 +26957,7 @@ "b03795": "LG Electronics", "b03829": "Siliconware Precision Industries Co., Ltd.", "b03850": "Nanjing CAS-ZDC IOT SYSTEM CO.,LTD", - "b03893": "Onda TLC GmbH", + "b03893": "Onda TLC Italia S.r.l.", "b038e2": "Wanan Hongsheng Electronic Co.Ltd", "b03956": "NETGEAR", "b03ace": "Huawei Device Co., Ltd.", @@ -26989,6 +27085,7 @@ "b0a10a": "Pivotal Systems Corporation", "b0a2e7": "Shenzhen TINNO Mobile Technology Corp.", "b0a37e": "QING DAO HAIER TELECOM CO.,LTD.", + "b0a3f2": "Huaqin Technology Co. LTD", "b0a454": "Tripwire Inc.", "b0a460": "Intel Corporate", "b0a4f0": "HUAWEI TECHNOLOGIES CO.,LTD", @@ -27062,7 +27159,7 @@ "b0d5cc": "Texas Instruments", "b0d7c5": "Logipix Ltd", "b0d7cc": "Tridonic GmbH & Co KG", - "b0d888": "Panasonic Corporation Automotive", + "b0d888": "Panasonic Automotive Systems Co.,Ltd", "b0da00": "CERA ELECTRONIQUE", "b0daf9": "ARRIS Group, Inc.", "b0dcef": "Intel Corporate", @@ -27106,6 +27203,7 @@ "b0f893": "Shanghai MXCHIP Information Technology Co., Ltd.", "b0f963": "Hangzhou H3C Technologies Co., Limited", "b0faeb": "Cisco Systems, Inc", + "b0fb15": "Laird Connectivity", "b0fbdd": "Shenzhen SuperElectron Technology Co.,Ltd.", "b0fc0d": "Amazon Technologies Inc.", "b0fc36": "CyberTAN Technology Inc.", @@ -27204,6 +27302,7 @@ "b44bd6": "IEEE Registration Authority", "b44c3b": "Zhejiang Dahua Technology Co., Ltd.", "b44cc2": "NR ELECTRIC CO., LTD", + "b44d43": "IEEE Registration Authority", "b44f96": "Zhejiang Xinzailing Technology co., ltd", "b45062": "EmBestor Technology Inc.", "b451f9": "NB Software", @@ -27530,6 +27629,7 @@ "b85e7b": "Samsung Electronics Co.,Ltd", "b85f98": "Amazon Technologies Inc.", "b85fb0": "HUAWEI TECHNOLOGIES CO.,LTD", + "b86061": "China Mobile Group Device Co.,Ltd.", "b86091": "Onnet Technologies and Innovations LLC", "b86142": "Beijing Tricolor Technology Co., Ltd", "b8616f": "Accton Technology Corp", @@ -28039,6 +28139,7 @@ "bcf2af": "devolo AG", "bcf310": "Extreme Networks, Inc.", "bcf45f": "zte corporation", + "bcf499": "Rockwell Automation", "bcf4d4": "CLOUD NETWORK TECHNOLOGY SINGAPORE PTE. LTD.", "bcf61c": "Geomodeling Wuxi Technology Co. Ltd.", "bcf685": "D-Link International", @@ -28140,6 +28241,7 @@ "c048e6": "Samsung Electronics Co.,Ltd", "c048fb": "Shenzhen JingHanDa Electronics Co.Ltd", "c0493d": "MAITRISE TECHNOLOGIQUE", + "c04943": "zte corporation", "c049ef": "Espressif Inc.", "c04a00": "TP-LINK TECHNOLOGIES CO.,LTD.", "c04a09": "Zhejiang Everbright Communication Equip. Co,. Ltd", @@ -28154,6 +28256,7 @@ "c056e3": "Hangzhou Hikvision Digital Technology Co.,Ltd.", "c057bc": "Avaya Inc", "c058a7": "Pico Systems Co., Ltd.", + "c05b44": "Beijing Xiaomi Mobile Software Co., Ltd", "c05e6f": "V. Stonkaus firma Kodinis Raktas", "c05e79": "SHENZHEN HUAXUN ARK TECHNOLOGIES CO.,LTD", "c06118": "TP-LINK TECHNOLOGIES CO.,LTD.", @@ -28576,6 +28679,7 @@ "c4a559": "IEEE Registration Authority", "c4a64e": "Quectel Wireless Solutions Co.,Ltd.", "c4a72b": "SHENZHEN CHUANGWEI-RGB ELECTRONICS CO.,LTD", + "c4a816": "eero inc.", "c4a81d": "D-Link International", "c4aaa1": "SUMMIT DEVELOPMENT, spol.s r.o.", "c4aac4": "Zhejiang Dahua Technology Co., Ltd.", @@ -28657,6 +28761,7 @@ "c4eb42": "Sagemcom Broadband SAS", "c4eb43": "Sagemcom Broadband SAS", "c4ebe3": "RRCN SAS", + "c4ebff": "zte corporation", "c4edba": "Texas Instruments", "c4eeae": "VSS Monitoring", "c4eef5": "II-VI Incorporated", @@ -28705,6 +28810,7 @@ "c80e95": "OmniLync Inc.", "c81073": "CENTURY OPTICOMM CO.,LTD", "c8120b": "Samsung Electronics Co.,Ltd", + "c81337": "Juniper Networks", "c8138b": "Shenzhen Skyworth Digital Technology CO., Ltd", "c81451": "HUAWEI TECHNOLOGIES CO.,LTD", "c81479": "Samsung Electronics Co.,Ltd", @@ -28859,6 +28965,7 @@ "c8965a": "SKY UK LIMITED", "c89665": "Microsoft Corporation", "c8979f": "Nokia Corporation", + "c89828": "zte corporation", "c899b2": "Arcadyan Corporation", "c89bad": "Honor Device Co., Ltd.", "c89bd7": "Realme Chongqing Mobile Telecommunications Corp.,Ltd.", @@ -29221,6 +29328,7 @@ "ccb255": "D-Link International", "ccb3ab": "shenzhen Biocare Bio-Medical Equipment Co.,Ltd.", "ccb3f8": "FUJITSU ISOTEC LIMITED", + "ccb54c": "Texas Instruments", "ccb55a": "Fraunhofer ITWM", "ccb5d1": "Beijing Xiaomi Mobile Software Co., Ltd", "ccb691": "NECMagnusCommunications", @@ -29439,6 +29547,7 @@ "d05fb8": "Texas Instruments", "d05fce": "Hitachi Data Systems", "d0608c": "zte corporation", + "d06158": "HUAWEI TECHNOLOGIES CO.,LTD", "d062a0": "Co., Ltd.", "d0634d": "Meiko Maschinenbau GmbH & Co. KG", "d063b4": "SolidRun Ltd.", @@ -29650,6 +29759,7 @@ "d4258b": "Intel Corporate", "d425cc": "IEEE Registration Authority", "d42751": "Infopia Co., Ltd", + "d42787": "Shanghai High-Flying Electronics Technology Co., Ltd", "d428b2": "ioBridge, Inc.", "d428d5": "TCT mobile ltd", "d429ea": "Zimory GmbH", @@ -29709,6 +29819,7 @@ "d4522a": "TangoWiFi.com", "d45251": "IBT Ingenieurbureau Broennimann Thun", "d45297": "nSTREAMS Technologies, Inc.", + "d452c7": "Beijing L&S Lancom Platform Tech. Co., Ltd.", "d452ee": "SKY UK LIMITED", "d45347": "Merytronic 2012, S.L.", "d45383": "Murata Manufacturing Co., Ltd.", @@ -29859,12 +29970,14 @@ "d4b169": "Limited", "d4b27a": "ARRIS Group, Inc.", "d4b43e": "Messcomp Datentechnik GmbH", + "d4b680": "Shanghai Linkyum Microeletronics Co.,Ltd", "d4b709": "zte corporation", "d4b761": "Sichuan AI-Link Technology Co., Ltd.", "d4b7d0": "Ciena Corporation", "d4b8ff": "Home Control Singapore Pte Ltd", "d4b92f": "Technicolor CH USA Inc.", "d4baba": "IEEE Registration Authority", + "d4bafa": "GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD", "d4bbc8": "vivo Mobile Communication Co., Ltd.", "d4bbe6": "Huawei Device Co., Ltd.", "d4bd1e": "5VT Technologies,Taiwan LTd.", @@ -29918,6 +30031,7 @@ "d4e880": "Cisco Systems, Inc", "d4e8b2": "Samsung Electronics Co.,Ltd", "d4e90b": "CVT CO.,LTD", + "d4e95e": "Texas Instruments", "d4e98a": "Intel Corporate", "d4ea0e": "Avaya Inc", "d4eb68": "Cisco Systems, Inc", @@ -30132,6 +30246,7 @@ "d88c79": "Google, Inc.", "d88d5c": "Elentec", "d88dc8": "Atil Technology Co., LTD", + "d88ed4": "eero inc.", "d88f76": "Apple, Inc.", "d890e8": "Samsung Electronics Co.,Ltd", "d8912a": "Zyxel Communications Corporation", @@ -30229,6 +30344,7 @@ "d8d27c": "JEMA ENERGY, SA", "d8d385": "Hewlett Packard", "d8d43c": "Sony Corporation", + "d8d45d": "Orbic North America", "d8d4e6": "Hytec Inter Co., Ltd.", "d8d5b9": "Rainforest Automation, Inc.", "d8d67e": "GSK CNC EQUIPMENT CO.,LTD", @@ -30347,6 +30463,7 @@ "dc3350": "TechSAT GmbH", "dc35f1": "Positivo Tecnologia S.A.", "dc360c": "Hitron Technologies. Inc", + "dc3642": "zte corporation", "dc3643": "IEEE Registration Authority", "dc3714": "Apple, Inc.", "dc3752": "GE", @@ -30437,6 +30554,7 @@ "dc8c1b": "vivo Mobile Communication Co., Ltd.", "dc8c37": "Cisco Systems, Inc", "dc8d8a": "Nokia Solutions and Networks GmbH & Co. KG", + "dc8d91": "Infinix mobility limited", "dc8db7": "ATW TECHNOLOGY, INC.", "dc8e95": "Silicon Laboratories", "dc9020": "RURU TEK PRIVATE LIMITED ", @@ -30522,6 +30640,7 @@ "dccf96": "Samsung Electronics Co.,Ltd", "dcd0f7": "Bentek Systems Ltd.", "dcd255": "Kinpo Electronics, Inc.", + "dcd26a": "Hangzhou Hikvision Digital Technology Co.,Ltd.", "dcd2fc": "HUAWEI TECHNOLOGIES CO.,LTD", "dcd2fd": "HUAWEI TECHNOLOGIES CO.,LTD", "dcd321": "HUMAX Co., Ltd.", @@ -30783,6 +30902,7 @@ "e09db8": "PLANEX COMMUNICATIONS INC.", "e09dfa": "Wanan Hongsheng Electronic Co.Ltd", "e09f2a": "Iton Technology Corp. ", + "e0a129": "Extreme Networks, Inc.", "e0a198": "NOJA Power Switchgear Pty Ltd", "e0a1ce": "zte corporation", "e0a1d7": "SFR", @@ -30933,6 +31053,7 @@ "e417d8": "8BITDO TECHNOLOGY HK LIMITED", "e4186b": "Zyxel Communications Corporation", "e419c1": "HUAWEI TECHNOLOGIES CO.,LTD", + "e41a1d": "NOVEA ENERGIES", "e41a2c": "ZPE Systems, Inc.", "e41c4b": "V2 TECHNOLOGY, INC.", "e41d2d": "Mellanox Technologies, Inc.", @@ -30973,6 +31094,7 @@ "e435c8": "HUAWEI TECHNOLOGIES CO.,LTD", "e435fb": "Ltd", "e437d7": "HENRI DEPAEPE S.A.S.", + "e43819": "Shenzhen Hi-Link Electronic CO.,Ltd.", "e4387e": "Cisco Systems, Inc", "e43883": "Ubiquiti Inc", "e4388c": "Digital Products Limited", @@ -30992,6 +31114,7 @@ "e442a6": "Intel Corporate", "e4434b": "Dell Inc.", "e444e5": "Extreme Networks, Inc.", + "e44519": "Beijing Xiaomi Electronics Co.,Ltd", "e446b0": "Fujitsu Client Computing Limited", "e446bd": "C&C TECHNIC TAIWAN CO., LTD.", "e446da": "Xiaomi Communications Co Ltd", @@ -31076,6 +31199,7 @@ "e48c73": "Realme Chongqing Mobile Telecommunications Corp.,Ltd.", "e48d8c": "Routerboard.com", "e48e10": "CIG SHANGHAI CO LTD", + "e48ebb": "Rockwell Automation", "e48f1d": "Huawei Device Co., Ltd.", "e48f34": "Vodafone Italia S.p.A.", "e48f65": "Yelatma Instrument Making Enterprise, JSC", @@ -31120,6 +31244,7 @@ "e4afa1": "HES-SO", "e4b005": "Beijing IQIYI Science & Technology Co., Ltd.", "e4b021": "Samsung Electronics Co.,Ltd", + "e4b224": "HUAWEI TECHNOLOGIES CO.,LTD", "e4b2fb": "Apple, Inc.", "e4b318": "Intel Corporate", "e4b503": "Realme Chongqing Mobile Telecommunications Corp.,Ltd.", @@ -31195,6 +31320,7 @@ "e4f8ef": "Samsung Electronics Co.,Ltd", "e4f939": "Minxon Hotel Technology INC.", "e4fa1d": "PAD Peripheral Advanced Design Inc.", + "e4fac4": "Big Field Global PTE. Ltd.", "e4faed": "Samsung Electronics Co.,Ltd", "e4fafd": "Intel Corporate", "e4fb5d": "HUAWEI TECHNOLOGIES CO.,LTD", @@ -31247,6 +31373,7 @@ "e81da8": "Ruckus Wireless", "e81e92": "Huawei Device Co., Ltd.", "e820e2": "HUMAX Co., Ltd.", + "e82404": "Quectel Wireless Solutions Co.,Ltd.", "e824a6": "Juniper Networks", "e82689": "Aruba, a Hewlett Packard Enterprise Company", "e8268d": "Shenzhen SuperElectron Technology Co.,Ltd.", @@ -31846,6 +31973,7 @@ "f01e34": "ORICO Technologies Co., Ltd", "f01faf": "Dell Inc.", "f01fc7": "Apple, Inc.", + "f02178": "UNIONMAN TECHNOLOGY CO.,LTD", "f0219d": "Cal-Comp Electronics & Communications Company Ltd.", "f021e0": "eero inc.", "f0221d": "IEEE Registration Authority", @@ -32333,6 +32461,7 @@ "f4a739": "Juniper Networks", "f4a80d": "Wistron InfoComm(Kunshan)Co.,Ltd.", "f4a997": "CANON INC.", + "f4aad0": "OHSUNG", "f4acc1": "Cisco Systems, Inc", "f4afe7": "Apple, Inc.", "f4b164": "Lightning Telecommunications Technology Co. Ltd", @@ -32377,6 +32506,7 @@ "f4c88a": "Intel Corporate", "f4ca24": "FreeBit Co., Ltd.", "f4cae5": "FREEBOX SAS", + "f4cae7": "Arcadyan Corporation", "f4cb52": "HUAWEI TECHNOLOGIES CO.,LTD", "f4cc55": "Juniper Networks", "f4cd90": "Vispiron Rotec GmbH", @@ -32500,6 +32630,7 @@ "f82387": "Shenzhen Horn Audio Co.,Ltd.", "f823b2": "HUAWEI TECHNOLOGIES CO.,LTD", "f82441": "Yeelink", + "f824db": "EntryPoint Networks, Inc", "f824e4": "Co., Ltd", "f82551": "Seiko Epson Corporation", "f8272e": "Mercku", @@ -32512,6 +32643,7 @@ "f82c18": "2Wire Inc", "f82d7c": "Apple, Inc.", "f82dc0": "ARRIS Group, Inc.", + "f82e0c": "Texas Instruments", "f82e3f": "HUAWEI TECHNOLOGIES CO.,LTD", "f82e8e": "Nanjing Kechen Electric Co., Ltd.", "f82edb": "RTW GmbH & Co. KG", @@ -32600,6 +32732,7 @@ "f864b8": "zte corporation", "f86601": "Suzhou Chi-tek information technology Co., Ltd", "f8665a": "Apple, Inc.", + "f86691": "Sichuan Tianyi Comheart Telecom Co.,LTD", "f866d1": "Hon Hai Precision Ind. Co.,Ltd.", "f866f2": "Cisco Systems, Inc", "f86971": "Seibu Electric Co.,", @@ -32623,6 +32756,7 @@ "f877b8": "Samsung Electronics Co.,Ltd", "f87907": "Huawei Device Co., Ltd.", "f8790a": "ARRIS Group, Inc.", + "f87928": "zte corporation", "f87999": "Guangdong Jiuzhi Technology Co.,Ltd", "f87a41": "Cisco Systems, Inc", "f87aef": "Rosonix Technology, Inc.", @@ -32733,6 +32867,7 @@ "f8c397": "NZXT Corp. Ltd.", "f8c39e": "HUAWEI TECHNOLOGIES CO.,LTD", "f8c3cc": "Apple, Inc.", + "f8c4ae": "GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD", "f8c4f3": "Shanghai Infinity Wireless Technologies Co.,Ltd.", "f8c678": "Carefusion", "f8c96c": "Fiberhome Telecommunication Technologies Co.,LTD", @@ -32909,6 +33044,7 @@ "fc4596": "CO., LTD. ", "fc45c3": "Texas Instruments", "fc47d8": "Apple, Inc.", + "fc48c9": "Yobiiq Intelligence B.V.", "fc48ef": "HUAWEI TECHNOLOGIES CO.,LTD", "fc492d": "Amazon Technologies Inc.", "fc4ae9": "Castlenet Technology Inc.", @@ -32976,6 +33112,7 @@ "fc8399": "Avaya Inc", "fc83c6": "N-Radio Technologies Co., Ltd.", "fc8417": "Honor Device Co., Ltd.", + "fc84a7": "Murata Manufacturing Co., Ltd.", "fc8596": "Axonne Inc.", "fc862a": "Huawei Device Co., Ltd.", "fc8743": "HUAWEI TECHNOLOGIES CO.,LTD", diff --git a/netutils/password.py b/netutils/password.py index 282b215f..3f66f407 100644 --- a/netutils/password.py +++ b/netutils/password.py @@ -71,6 +71,24 @@ "0x37", ] +JUNIPER_ENCODING = [ + [1, 4, 32], + [1, 16, 32], + [1, 8, 32], + [1, 64], + [1, 32], + [1, 4, 16, 128], + [1, 32, 64], +] + +JUNIPER_KEYS = ["QzF3n6/9CAtpu0O", "B1IREhcSyrleKvMW8LXx", "7N-dVbwsY2g4oaJZGUDj", "iHkq.mPf5T"] +JUNIPER_KEYS_STRING = "".join(JUNIPER_KEYS) +JUNIPER_KEYS_LENGTH = len(JUNIPER_KEYS_STRING) +JUNIPER_CHARACTER_KEYS = dict() +for idx, key in enumerate(JUNIPER_KEYS): + for character in key: + JUNIPER_CHARACTER_KEYS[character] = 3 - idx + def _fail_on_mac(func: t.Callable[..., t.Any]) -> t.Callable[..., t.Any]: """There is an issue with Macintosh for encryption.""" @@ -252,3 +270,95 @@ def get_hash_salt(encrypted_password: str) -> str: if len(split_password) != 4: raise ValueError(f"Could not parse salt out password correctly from {encrypted_password}") return split_password[2] + + +def decrypt_juniper(encrypted_password: str) -> str: + """Given an encrypted Junos $9$ type password, decrypt it. + + Args: + encrypted_password: A password that has been encrypted, and will be decrypted. + + Returns: + The unencrypted_password password. + + Examples: + >>> from netutils.password import decrypt_juniper + >>> decrypt_juniper("$9$7YdwgGDkTz6oJz69A1INdb") + 'juniper' + >>> + """ + # Strip $9$ from start of string + password_characters = encrypted_password.split("$9$", 1)[1] + + # Get first character and toss extra characters + first_character = password_characters[0] + stripped_password_characters = password_characters[JUNIPER_CHARACTER_KEYS[first_character] + 1 :] + + previous_char = first_character + decrypted_password = "" # nosec + while stripped_password_characters: + # Get encoding modulus + decode = JUNIPER_ENCODING[len(decrypted_password) % len(JUNIPER_ENCODING)] + + # Get nibble we will decode + nibble = stripped_password_characters[0 : len(decode)] + stripped_password_characters = stripped_password_characters[len(decode) :] + + # Decode value for nibble and convert to character, append to decryped password + value = 0 + for idx, char in enumerate(nibble): + gap = ( + (JUNIPER_KEYS_STRING.index(char) - JUNIPER_KEYS_STRING.index(previous_char)) % JUNIPER_KEYS_LENGTH + ) - 1 + value += gap * decode[idx] + previous_char = char + decrypted_password += chr(value) + + return decrypted_password + + +def encrypt_juniper(unencrypted_password: str, salt: t.Optional[int] = None) -> str: + """Given an unencrypted password, encrypt to Juniper $9$ type password. + + Args: + unencrypted_password: A password that has not been encrypted, and will be compared against. + salt: A integer that can be set by the operator. Defaults to random generated one. + + Returns: + The encrypted password. + + Examples: + >>> from netutils.password import encrypt_juniper + >>> encrypt_juniper("juniper", 35) # doctest: +SKIP + '$9$7YdwgGDkTz6oJz69A1INdb' + >>> + """ + if not salt: + salt = random.randint(0, JUNIPER_KEYS_LENGTH) - 1 # nosec + + # Use salt to generate start of encrypted password + first_character = JUNIPER_KEYS_STRING[salt] + random_chars = "".join( + [ + JUNIPER_KEYS_STRING[random.randint(0, JUNIPER_KEYS_LENGTH) - 1] # nosec + for x in range(0, JUNIPER_CHARACTER_KEYS[first_character]) + ] + ) + encrypted_password = "$9$" + first_character + random_chars + + previous_character = first_character + for idx, char in enumerate(unencrypted_password): + encode = JUNIPER_ENCODING[idx % len(JUNIPER_ENCODING)][::-1] # Get encoding modulus in reverse order + char_ord = ord(char) + gaps: t.List[int] = [] + for modulus in encode: + gaps = [int(char_ord / modulus)] + gaps + char_ord %= modulus + + for gap in gaps: + gap += JUNIPER_KEYS_STRING.index(previous_character) + 1 + new_character = JUNIPER_KEYS_STRING[gap % JUNIPER_KEYS_LENGTH] + previous_character = new_character + encrypted_password += new_character + + return encrypted_password diff --git a/netutils/utils.py b/netutils/utils.py index ff52ac7a..aa28155f 100644 --- a/netutils/utils.py +++ b/netutils/utils.py @@ -58,6 +58,8 @@ "encrypt_type5": "password.encrypt_type5", "encrypt_type7": "password.encrypt_type7", "get_hash_salt": "password.get_hash_salt", + "encrypt_juniper": "password.encrypt_juniper", + "decrypt_juniper": "password.decrypt_juniper", "tcp_ping": "ping.tcp_ping", "longest_prefix_match": "route.longest_prefix_match", "vlanlist_to_config": "vlan.vlanlist_to_config", diff --git a/tests/unit/test_password.py b/tests/unit/test_password.py index 6ed43750..320c7f20 100644 --- a/tests/unit/test_password.py +++ b/tests/unit/test_password.py @@ -69,6 +69,21 @@ }, ] +ENCRYPT_JUNIPER = [ + { + "sent": {"unencrypted_password": "juniper", "salt": 35}, + "received_one": "$9$7", + "received_two": "gGDkTz6oJz69A1INdb", + }, +] + +DECRYPT_JUNIPER = [ + { + "sent": {"encrypted_password": "$9$7YdwgGDkTz6oJz69A1INdb"}, + "received": "juniper", + } +] + @pytest.mark.parametrize("data", COMPARE_TYPE5) def test_compare_type5(data): @@ -98,3 +113,16 @@ def test_encrypt_type7(data): @pytest.mark.parametrize("data", GET_HASH_SALT) def test_get_hash_salt(data): assert password.get_hash_salt(**data["sent"]) == data["received"] + + +@pytest.mark.parametrize("data", ENCRYPT_JUNIPER) +def test_encrypt_juniper(data): + # Passwords include random padding, check only the non random sections + decrypted_password = password.encrypt_juniper(**data["sent"]) + assert decrypted_password[0:4] == data["received_one"] + assert decrypted_password[7:] == data["received_two"] + + +@pytest.mark.parametrize("data", DECRYPT_JUNIPER) +def test_decrypt_juniper(data): + assert password.decrypt_juniper(**data["sent"]) == data["received"]