Add more BMW software version definitions (#4143)

* Add more BMW software version definitions

* fix codespell

* add englisch translation

Author: polybassa

.config/codespell_ignore.txt

@@ -1,6 +1,7 @@
 aci
 ans
 archtypes
+applikation
 ba
 byteorder
 cace
@@ -11,12 +12,13 @@ delt
 doas
 doubleclick
 ether
-ether
 eventtypes
 fo
+funktion
 gost
 hart
 iff
+interaktive
 inout
 microsof
 mitre
@@ -32,6 +34,7 @@ ser
 singl
 slac
 te
+temporaere
 tim
 ue
 uint

scapy/contrib/automotive/bmw/definitions.py

@@ -15,7 +15,6 @@
 from scapy.contrib.automotive.uds import UDS, UDS_RDBI, UDS_DSC, UDS_IOCBI, \
     UDS_RC, UDS_RD, UDS_RSDBI, UDS_RDBIPR
 
-
 BMW_specific_enum = {
     0: "requestIdentifiedBCDDTCAndStatus",
     1: "requestSupportedBCDDTCAndStatus",
@@ -252,10 +251,60 @@ def i2repr(self, pkt, x):
 
 
 class SVK_Entry(Packet):
+    process_classes = {
+        "0x01": "HWEL",
+        "0x02": "HWAP",
+        "0x03": "HWFR",
+        "0x05": "CAFD",
+        "0x06": "BTLD",
+        "0x08": "SWFL",
+        "0x09": "SWFF",
+        "0x0A": "SWPF",
+        "0x0B": "ONPS",
+        "0x0F": "FAFP",
+        "0x1A": "TLRT",
+        "0x1B": "TPRG",
+        "0x07": "FLSL",
+        "0x0C": "IBAD",
+        "0x10": "FCFA",
+        "0x1C": "BLUP",
+        "0x1D": "FLUP",
+        "0xC0": "SWUP",
+        "0xC1": "SWIP",
+        "0xA0": "ENTD",
+        "0xA1": "NAVD",
+        "0xA2": "FCFN",
+        "0x04": "GWTB",
+        "0x0D": "SWFK",
+    }
+    """
+        HWEL - Hardware (Elektronik) - Hardware (Electronics)
+        HWAP - Hardwareauspraegung - Hardware Configuration
+        HWFR - Hardwarefarbe - Hardware Color
+        CAFD - Codierdaten - Coding Data
+        BTLD - Bootloader - Bootloader
+        SWFL - Software ECU Speicherimage - Software ECU Storage Image
+        SWFF - Flash File Software - Flash File Software
+        SWPF - Pruefsoftware - Testing Software
+        ONPS - Onboard Programmiersystem - Onboard Programming System
+        FAFP - FA2FP - FA2FP
+        TLRT - Temporaere Loeschroutine - Temporary Deletion Routine
+        TPRG - Temporaere Programmierroutine - Temporary Programming Routine
+        FLSL - Flashloader Slave - Flashloader Slave
+        IBAD - Interaktive Betriebsanleitung Daten - Interactive Operating Manual Data
+        FCFA - Freischaltcode Fahrzeug-Auftrag - Vehicle Order Unlock Code
+        BLUP - Bootloader-Update Applikation - Bootloader Update Application
+        FLUP - Flashloader-Update Applikation - Flashloader Update Application
+        SWUP - Software-Update Package - Software Update Package
+        SWIP - Index Software-Update Package - Software Update Package Index
+        ENTD - Entertainment Daten - Entertainment Data
+        NAVD - Navigation Daten - Navigation Data
+        FCFN - Freischaltcode Funktion - Function Unlock Code
+        GWTB - Gateway-Tabelle - Gateway Table
+        SWFK - BEGU: Detaillierung auf SWE-Ebene - BEGU: Detailing at SWE Level
+    """
     fields_desc = [
-        ByteEnumField("processClass", 0, {1: "HWEL", 2: "HWAP", 4: "GWTB",
-                                          5: "CAFD", 6: "BTLD", 7: "FLSL",
-                                          8: "SWFL"}),
+        ByteEnumField("processClass", 0, process_classes),
         XStrFixedLenField("svk_id", b"", length=4),
         ByteField("mainVersion", 0),
         ByteField("subVersion", 0),
@@ -372,7 +421,6 @@ class WEBSERVER(Packet):
 bind_layers(DEV_JOB, READ_MEM, identifier=0xffff)
 bind_layers(DEV_JOB_PR, READ_MEM_PR, identifier=0xffff)
 
-
 bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf101)
 bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf102)
 bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf103)
@@ -438,7 +486,6 @@ class WEBSERVER(Packet):
 bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf13f)
 bind_layers(UDS_RDBIPR, SVK, dataIdentifier=0xf140)
 
-
 UDS_RDBI.dataIdentifiers[0x0014] = "RDBCI_IS_LESEN_DETAIL_REQ"
 UDS_RDBI.dataIdentifiers[0x0015] = "RDBCI_HS_LESEN_DETAIL_REQ"
 UDS_RDBI.dataIdentifiers[0x0e80] = "AirbagLock"
@@ -1505,7 +1552,7 @@ class WEBSERVER(Packet):
 UDS_RDBI.dataIdentifiers[0x22fd] = "afterSalesServiceData_2200_22FF"
 UDS_RDBI.dataIdentifiers[0x22fe] = "afterSalesServiceData_2200_22FF"
 UDS_RDBI.dataIdentifiers[0x22ff] = "afterSalesServiceData_2200_22FF"
-UDS_RDBI.dataIdentifiers[0x2300] = "operatingData"       # or RDBCI_BETRIEBSDATEN_LESEN_REQ  # noqa E501
+UDS_RDBI.dataIdentifiers[0x2300] = "operatingData"  # or RDBCI_BETRIEBSDATEN_LESEN_REQ  # noqa E501
 UDS_RDBI.dataIdentifiers[0x2301] = "additionalOperatingData 2301-23FF"
 UDS_RDBI.dataIdentifiers[0x2302] = "additionalOperatingData 2301-23FF"
 UDS_RDBI.dataIdentifiers[0x2303] = "additionalOperatingData 2301-23FF"
@@ -1831,13 +1878,13 @@ class WEBSERVER(Packet):
 UDS_RDBI.dataIdentifiers[0x2503] = "ProgrammingCounterMax"
 UDS_RDBI.dataIdentifiers[0x2504] = "FlashTimings"
 UDS_RDBI.dataIdentifiers[0x2505] = "MaxBlocklength"
-UDS_RDBI.dataIdentifiers[0x2506] = "ReadMemoryAddress"       # or maximaleBlockLaenge  # noqa E501
+UDS_RDBI.dataIdentifiers[0x2506] = "ReadMemoryAddress"  # or maximaleBlockLaenge  # noqa E501
 UDS_RDBI.dataIdentifiers[0x2507] = "EcuSupportsDeleteSwe"
 UDS_RDBI.dataIdentifiers[0x2508] = "GWRoutingStatus"
 UDS_RDBI.dataIdentifiers[0x2509] = "RoutingTable"
 UDS_RDBI.dataIdentifiers[0x2530] = "SubnetStatus"
 UDS_RDBI.dataIdentifiers[0x2541] = "STATUS_CALCVN"
-UDS_RDBI.dataIdentifiers[0x3000] = "RDBI_CD_REQ"       # or WDBI_CD_REQ
+UDS_RDBI.dataIdentifiers[0x3000] = "RDBI_CD_REQ"  # or WDBI_CD_REQ
 UDS_RDBI.dataIdentifiers[0x300a] = "Codier-VIN"
 UDS_RDBI.dataIdentifiers[0x37fe] = "Codierpruefstempel"
 UDS_RDBI.dataIdentifiers[0x3f00] = "SVT-Ist"
@@ -4864,7 +4911,7 @@ class WEBSERVER(Packet):
 UDS_RC.routineControlIdentifiers[0x0f09] = "checkSignature"
 UDS_RC.routineControlIdentifiers[0x0f0a] = "checkProgrammingStatus"
 UDS_RC.routineControlIdentifiers[0x0f0b] = "ExecuteDiagnosticService"
-UDS_RC.routineControlIdentifiers[0x0f0c] = "SetEnergyMode"       # or controlEnergySavingMode  # noqa E501
+UDS_RC.routineControlIdentifiers[0x0f0c] = "SetEnergyMode"  # or controlEnergySavingMode  # noqa E501
 UDS_RC.routineControlIdentifiers[0x0f0d] = "resetSystemFaultMessage"
 UDS_RC.routineControlIdentifiers[0x0f0e] = "timeControlledPowerDown"
 UDS_RC.routineControlIdentifiers[0x0f0f] = "disableCommunicationOverGateway"