diff --git a/CHANGELOG b/CHANGELOG index a7bd31414..c62152bef 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ #Nmap Changelog ($Id$); -*-text-*- +o [NSE][GH#1212] Updates vendors from ODVA list for enip-info. [NothinRandom] + o [NSE][GH#1191] Add two common error strings that improve MySQL detection by the script http-sql-injection. [Robert Taylor, Paulino Calderon] diff --git a/scripts/enip-info.nse b/scripts/enip-info.nse index 7a5c6fc2d..9d8423a44 100644 --- a/scripts/enip-info.nse +++ b/scripts/enip-info.nse @@ -145,7 +145,7 @@ local vendor_id = { [76] = "NKE Corporation", [77] = "Rockwell Software Inc.", [78] = "Escort Memory Systems (A Datalogic Group Co.)", - [79] = "Reserved", + [79] = "Berk-Tek", [80] = "Industrial Devices Corporation", [81] = "IXXAT Automation GmbH", [82] = "Mitsubishi Electric Automation Inc.", @@ -154,7 +154,7 @@ local vendor_id = { [85] = "Reserved", [86] = "Horner Electric", [87] = "Burkert Werke GmbH & Co. KG", - [88] = "Reserved", + [88] = "Industrial Indexing Systems, Inc.", [89] = "Industrial Indexing Systems Inc.", [90] = "HMS Industrial Networks AB", [91] = "Robicon", @@ -223,7 +223,7 @@ local vendor_id = { [154] = "Japan Radio Co.Ltd", [155] = "NADEX Co.Ltd", [156] = "Ametek Automation & Process Technologies", - [157] = "Reserved", + [157] = "FACTS, Inc.", [158] = "KVASER AB", [159] = "IDEC IZUMI Corporation", [160] = "Mitsubishi Heavy Industries Ltd", @@ -400,7 +400,7 @@ local vendor_id = { [331] = "Interface Corporation", [332] = "Grape Systems Inc.", [333] = "Reserved", - [334] = "Reserved", + [334] = "KEBA AG", [335] = "Toshiba IT & Control Systems Corporation", [336] = "Sanyo Machine WorksLtd.", [337] = "Vansco Electronics Ltd.", @@ -412,7 +412,7 @@ local vendor_id = { [343] = "Ferran Scientific Inc.", [344] = "KEBA AG", [345] = "Endress + Hauser", - [346] = "Reserved", + [346] = "Lincoln Electric Company", [347] = "ABB ALSTOM Power UK Ltd. (EGT)", [348] = "Berger Lahr GmbH", [349] = "Reserved", @@ -464,7 +464,7 @@ local vendor_id = { [395] = "Suzuki Motor Corporation", [396] = "Custom Servo Motors Inc.", [397] = "PACE Control Systems", - [398] = "Reserved", + [398] = "Selectron Systems AG", [399] = "Reserved", [400] = "LINTEC Co.Ltd.", [401] = "Hitachi Cable Ltd.", @@ -509,7 +509,7 @@ local vendor_id = { [440] = "Roboticsware Inc.", [441] = "Nachi Fujikoshi Corporation", [442] = "Hengstler GmbH", - [443] = "Reserved", + [443] = "Vacon Plc", [444] = "SUNNY GIKEN Inc.", [445] = "Lenze Drive Systems GmbH", [446] = "CD Systems B.V.", @@ -518,7 +518,7 @@ local vendor_id = { [449] = "Embedded System Products Inc.", [450] = "Reserved", [451] = "Mencom Corporation", - [452] = "Reserved", + [452] = "Kollmorgen", [453] = "Matsushita Welding Systems Co.Ltd.", [454] = "Dengensha Mfg. Co. Ltd.", [455] = "Quinn Systems Ltd.", @@ -537,7 +537,7 @@ local vendor_id = { [468] = "Baumer IVO GmbH & Co. KG", [469] = "Worcester Controls Corporation", [470] = "Pyramid Technical Consultants Inc.", - [471] = "Reserved", + [471] = "Eilersen Electric A/S", [472] = "Apollo Fire Detectors Limited", [473] = "Avtron Manufacturing Inc.", [474] = "Reserved", @@ -590,7 +590,7 @@ local vendor_id = { [521] = "Fujikin Inc.", [522] = "Estic Corp.", [523] = "GS Hydraulic Sales", - [524] = "Reserved", + [524] = "Leuze Electronic GmbH & Co. KG", [525] = "MTE Limited", [526] = "Hyde Park Electronics Inc.", [527] = "Pfeiffer Vacuum GmbH", @@ -667,7 +667,7 @@ local vendor_id = { [598] = "Yokoyama Shokai Co.Ltd.", [599] = "Toyogiken Co.Ltd.", [600] = "Coester Equipamentos Eletronicos Ltda.", - [601] = "Reserved", + [601] = "Kawasaki Heavy Industries, Ltd.", [602] = "Electroplating Engineers of Japan Ltd.", [603] = "ROBOX S.p.A.", [604] = "Spraying Systems Company", @@ -719,7 +719,7 @@ local vendor_id = { [650] = "Seoil Electric Co.Ltd.", [651] = "Fife Corporation", [652] = "Shanghai Electrical Apparatus Research Institute", - [653] = "Reserved", + [653] = "Detector Electronics", [654] = "Parasense Development Centre", [655] = "Reserved", [656] = "Reserved", @@ -860,7 +860,7 @@ local vendor_id = { [791] = "Japan Support System Ltd.", [792] = "Decsys", [793] = "Metronix Messgerate u. Elektronik GmbH", - [794] = "Reserved", + [794] = "ROPEX Industrie - Elektronik GmbH", [795] = "Vaccon Company Inc.", [796] = "Siemens Energy & Automation Inc.", [797] = "Ten X Technology Inc.", @@ -1132,7 +1132,7 @@ local vendor_id = { [1063] = "Nicollet Technologies Corp.", [1064] = "B.F. Systems", [1065] = "Empire Wire and Supply LLC", - [1066] = "Reserved", + [1066] = "ENDO KOGYO CO., LTD", [1067] = "Elmo Motion Control LTD", [1068] = "Reserved", [1069] = "Asahi Keiki Co.Ltd.", @@ -1286,7 +1286,280 @@ local vendor_id = { [1237] = "ACOREL SAS", [1238] = "Global Engineering Solutions Co.Ltd.", [1239] = "ALTE Transportation] = S.L.", - [1240] = "Penko Engineering B.V." + [1240] = "Penko Engineering B.V.", + [1241] = "Z-Tec Automation Systems Inc.", + [1242] = "ENTRON Controls LLC", + [1243] = "Johannes Huebner Fabrik Elektrischer Maschinen GmbH", + [1244] = "RF IDeas, Inc.", + [1245] = "Pentronic AB", + [1246] = "SCA Schucker GmbH & Co. KG", + [1247] = "TDK-Lambda", + [1248] = "Reserved", + [1249] = "Reserved", + [1250] = "Altronic LLC", + [1251] = "Siemens AG", + [1252] = "Liebherr Transportation Systems GmbH & Co KG", + [1253] = "Reserved", + [1254] = "SKF USA Inc.", + [1255] = "Reserved", + [1256] = "LMI Technologies", + [1257] = "Reserved", + [1258] = "Reserved", + [1259] = "EN Technologies Inc.", + [1260] = "Reserved", + [1261] = "CEPHALOS Automatisierung mbH", + [1262] = "Atronix Engineering, Inc.", + [1263] = "Monode Marking Products, Inc.", + [1264] = "Reserved", + [1265] = "Quabbin Wire & Cable Co., Inc.", + [1266] = "GPSat Systems Australia", + [1267] = "Reserved", + [1268] = "Reserved", + [1269] = "Tri-Tronics Co., Inc.", + [1270] = "Rovema GmbH", + [1271] = "Reserved", + [1272] = "IEP GmbH", + [1273] = "Reserved", + [1274] = "Reserved", + [1275] = "Reserved", + [1276] = "Reserved", + [1277] = "Control Chief Corporation", + [1278] = "Reserved", + [1279] = "Reserved", + [1280] = "Jacktek Systems Inc.", + [1281] = "Reserved", + [1282] = "PRIMES GmbH", + [1283] = "Branson Ultrasonics", + [1284] = "DEIF A/S", + [1285] = "3S-Smart Software Solutions GmbH", + [1286] = "Reserved", + [1287] = "Smarteye Corporation", + [1288] = "Toshiba Machine", + [1289] = "eWON", + [1290] = "OFS", + [1291] = "KROHNE", + [1292] = "Reserved", + [1293] = "General Cable Industries, Inc.", + [1294] = "Reserved", + [1295] = "Kistler Instrumente AG", + [1296] = "YJS Co., Ltd.", + [1297] = "Reserved", + [1298] = "Reserved", + [1299] = "Reserved", + [1300] = "Reserved", + [1301] = "Xylem Analytics Germany GmbH", + [1302] = "Lenord, Bauer & Co. GmbH", + [1303] = "Carlo Gavazzi Controls", + [1304] = "Faiveley Transport", + [1305] = "Reserved", + [1306] = "vMonitor", + [1307] = "Kepware Technologies", + [1308] = "duagon AG", + [1309] = "Reserved", + [1310] = "Xylem Water Solutions", + [1311] = "Automation Professionals, LLC", + [1312] = "Reserved", + [1313] = "CEIA SpA", + [1314] = "Marine Technologies LLC", + [1315] = "Alphagate Automatisierungstechnik GmbH", + [1316] = "Mecco Partners, LLC", + [1317] = "LAP GmbH Laser Applikationen", + [1318] = "ABB S.p.A. - SACE Division", + [1319] = "ABB S.p.A. - SACE Division", + [1320] = "Reserved", + [1321] = "Reserved", + [1322] = "Thermo Ramsey Inc.", + [1323] = "Helmholz GmbH & Co. KG", + [1324] = "EUCHNER GmbH + Co. KG", + [1325] = "AMK GmbH & Co. KG", + [1326] = "Badger Meter", + [1327] = "Reserved", + [1328] = "Fisher-Rosemount Systems, Inc.", + [1329] = "LJU Automatisierungstechnik GmbH", + [1330] = "Fairbanks Scales, Inc.", + [1331] = "Imperx, Inc.", + [1332] = "FRONIUS International GmbH", + [1333] = "Hoffman Enclosures", + [1334] = "Elecsys Corporation", + [1335] = "Bedrock Automation", + [1336] = "RACO Manufacturing and Engineering", + [1337] = "Hein Lanz Industrial Tech.", + [1338] = "Synopsys, Inc. (formerly Codenomicon)", + [1339] = "Reserved", + [1340] = "Reserved", + [1341] = "Sensirion AG", + [1342] = "SIKO GmbH", + [1343] = "Reserved", + [1344] = "GRUNDFOS", + [1345] = "Reserved", + [1346] = "Beijer Electronics Products AB", + [1347] = "Reserved", + [1348] = "AIMCO", + [1349] = "Reserved", + [1350] = "Coval Vacuum Managers", + [1351] = "Powell Industries", + [1352] = "Reserved", + [1353] = "IPDisplays", + [1354] = "SCAIME SAS", + [1355] = "Metal Work SpA", + [1356] = "Telsonic AG", + [1357] = "Reserved", + [1358] = "Hauch & Bach ApS", + [1359] = "Pago AG", + [1360] = "ULTIMATE Europe Transportation Equipment GmbH", + [1361] = "Reserved", + [1362] = "Enovation Controls", + [1363] = "Lake Cable LLC", + [1364] = "Reserved", + [1365] = "Reserved", + [1366] = "Reserved", + [1367] = "Laird", + [1368] = "Nanotec Electronic GmbH & Co. KG", + [1369] = "SAMWON ACT Co., Ltd.", + [1370] = "Aparian Inc.", + [1371] = "Cosys Inc.", + [1372] = "Insight Automation Inc.", + [1373] = "Reserved", + [1374] = "FASTECH", + [1375] = "K.A. Schmersal GmbH & Co. KG", + [1376] = "Reserved", + [1377] = "Chromalox", + [1378] = "SEIDENSHA ELECTRONICS CO., LTD", + [1379] = "Reserved", + [1380] = "Don Electronics Ltd", + [1381] = "burster gmbh & co kg", + [1382] = "Unitronics (1989) (RG) LTD", + [1383] = "OEM Technology Solutions", + [1384] = "Allied Motion", + [1385] = "Mitron Oy", + [1386] = "Dengensha TOA", + [1387] = "Systec Systemtechnik und Industrieautomation GmbH", + [1388] = "Reserved", + [1389] = "Jenny Science AG", + [1390] = "Baumer Optronic GmbH", + [1391] = "Invertek Drives Ltd", + [1392] = "High Grade Controls Corporation", + [1393] = "Reserved", + [1394] = "Ishida Europe Limited", + [1395] = "Reserved", + [1396] = "Actia Systems", + [1397] = "Reserved", + [1398] = "Beijing Tiandi-Marco Electro-Hydraulic Control System Co., Ltd.", + [1399] = "Universal Robots A/S", + [1400] = "Reserved", + [1401] = "Dialight", + [1402] = "E-T-A Elektrotechnische Apparate GmbH", + [1403] = "Kemppi Oy", + [1404] = "Tianjin Geneuo Technology Co., Ltd.", + [1405] = "ORing Industrial Networking Corp.", + [1406] = "Benchmark Electronics", + [1407] = "Reserved", + [1408] = "ELAP S.R.L.", + [1409] = "Applied Mining Technologies", + [1410] = "KITZ SCT Corporation", + [1411] = "VTEX Corporation", + [1412] = "ESYSE GmbH Embedded Systems Engineering", + [1413] = "Automation Controls", + [1414] = "Reserved", + [1415] = "Cincinnati Test Systems", + [1416] = "Reserved", + [1417] = "Zumbach Electronics Corp.", + [1418] = "Emerson Process Management", + [1419] = "CCS Inc.", + [1420] = "Videojet, Inc.", + [1421] = "Zebra Technologies", + [1422] = "Anritsu Infivis", + [1423] = "Dimetix AG", + [1424] = "General Measure (China)", + [1425] = "Fortress Interlocks", + [1426] = "Reserved", + [1427] = "Task Force Tips", + [1428] = "SERVO-ROBOT INC.", + [1429] = "Flow Devices and Systems, Inc.", + [1430] = "nLIGHT, Inc.", + [1431] = "Microchip Technology Inc.", + [1432] = "DENT Instruments", + [1433] = "CMC Industrial Electronics Ltd.", + [1434] = "Accutron Instruments Inc.", + [1435] = "Kaeser Kompressoren SE", + [1436] = "Optoelectronics", + [1437] = "Coherix, Inc.", + [1438] = "FLSmidth A/S", + [1439] = "Kyland Corporation", + [1440] = "Cole-Parmer Instrument Company", + [1441] = "Wachendorff Automation GmbH & Co., KG", + [1442] = "SMAC Moving Coil Actuators", + [1443] = "Reserved", + [1444] = "PushCorp, Inc.", + [1445] = "Fluke Process Instruments GmbH", + [1446] = "Mini Motor srl", + [1447] = "I-CON Industry Tech.", + [1448] = "Grace Engineered Products, Inc.", + [1449] = "Zaxis Inc.", + [1450] = "Lumasense Technologies", + [1451] = "Domino Printing", + [1452] = "LightMachinery Inc", + [1453] = "DEUTA-WERKE GmbH", + [1454] = "Altus Sistemas de Automação S.A.", + [1455] = "Criterion NDT", + [1456] = "InterTech Development Company", + [1457] = "Action Labs, Incorporated", + [1458] = "Perle Systems Limited", + [1459] = "Utthunga Technologies Pvt Ltd.", + [1460] = "Dong IL Vision, Co., Ltd.", + [1461] = "Wipotec Wiege-und Positioniersysteme GmbH", + [1462] = "Atos spa", + [1463] = "Solartron Metrology LTD", + [1464] = "Willowglen Systems Inc.", + [1465] = "Analog Devices", + [1466] = "Power Electronics International, Inc.", + [1467] = "Reserved", + [1468] = "Campbell Wrapper Corporatio", + [1469] = "Herkules-Resotec Elektronik GmbH", + [1470] = "aignep spa", + [1471] = "SHANGHAI CARGOA M.&E.EQUIPMENT CO.LTD", + [1472] = "PMV Automation AB", + [1473] = "K-Patents Oy", + [1474] = "Dynatronix", + [1475] = "Atop Technologies", + [1476] = "Bitronics, LLC.", + [1477] = "Delta Tau Data Systems", + [1478] = "WITZ Corporation", + [1479] = "AUTOSOL", + [1480] = "ADB Safegate", + [1481] = "VersaBuilt, Inc", + [1482] = "Visual Technologies, Inc.", + [1483] = "Artis GmbH", + [1484] = "Reliance Electric Limited", + [1485] = "Vanderlande", + [1486] = "Packet Power", + [1487] = "ima-tec gmbh", + [1488] = "Vision Automation A/S", + [1489] = "PROCENTEC BV", + [1490] = "HETRONIK GmbH", + [1491] = "Lanmark Controls Inc.", + [1492] = "profichip GmbH", + [1493] = "flexlog GmbH", + [1494] = "YUCHANGTECH", + [1495] = "Dynapower Company", + [1496] = "TAKIKAWA ENGINEERING", + [1497] = "Ingersoll Rand", + [1498] = "ASA-RT s.r.l", + [1499] = "Trumpf Laser- und Systemtectechnik Gmbh", + [1500] = "SYNTEC TECHNOLOGY CORPORATION COMPANY", + [1501] = "Rinstrum", + [1502] = "Symbotic LLC", + [1503] = "GE Healthcare Life Sciences", + [1504] = "BlueBotics SA", + [1505] = "Dynapar Corporation", + [1506] = "Blum-Novotest", + [1507] = "CIMON", + [1508] = "Dalian SeaSky Automation Co., ltd", + [1509] = "Rethink Robotics, Inc.", + [1510] = "Ingeteam", + [1511] = "TOSEI ENGINEERING CORP.", + [1512] = "SAMSON AG", + [1513] = "TGW Mechanics GmbH", } --return vendor information local function vendor_lookup(vennum) @@ -1338,7 +1611,6 @@ local device_type = { [43] = "Generic Device (keyable)", [44] = "Managed Switch", [59] = "ControlNet Physical Layer Component" - } --return device type information function device_type_lookup (devtype) @@ -1384,7 +1656,6 @@ action = function(host,port) end -- create new try try = nmap.new_try(catch) - -- connect to port on host try(socket:connect(host, port)) -- send Req Identity packet @@ -1403,7 +1674,6 @@ action = function(host,port) if ( command == 0x63) then -- if typeid == 0x0c (req ident) if( typeid == 0x0c) then - -- vendor number local vennum pos, vennum = bin.unpack("