From aeed81de291260c12934d3afe1425a3852875a01 Mon Sep 17 00:00:00 2001 From: Craig Smith Date: Fri, 21 Apr 2017 12:39:02 -0700 Subject: [PATCH] Code cleanup from Rubocop output Signed-off-by: Craig Smith --- lib/msf/core/post/hardware/automotive/dtc.rb | 596 +++++++++--------- lib/msf/core/post/hardware/zigbee/utils.rb | 10 +- .../extensions/automotive/uds_errors.rb | 2 +- .../console/command_dispatcher/automotive.rb | 6 +- .../ui/console/command_dispatcher/core.rb | 28 +- .../command_dispatcher/custom_methods.rb | 18 +- .../command_dispatcher/rftransceiver.rb | 14 +- .../ui/console/command_dispatcher/zigbee.rb | 4 +- 8 files changed, 339 insertions(+), 339 deletions(-) diff --git a/lib/msf/core/post/hardware/automotive/dtc.rb b/lib/msf/core/post/hardware/automotive/dtc.rb index a9a6930811aa..99e604aea9ab 100644 --- a/lib/msf/core/post/hardware/automotive/dtc.rb +++ b/lib/msf/core/post/hardware/automotive/dtc.rb @@ -1774,304 +1774,304 @@ module DTC "P3495" => "Cylinder 12 Exhaust Valve Control Circuit Low", "P3496" => "Cylinder 12 Exhaust Valve Control Circuit High", "P3497" => "Cylinder Deactivation System", - "U0001" => "High Speed CAN Communication Bus" , - "U0002" => "High Speed CAN Communication Bus (Performance)" , - "U0003" => "High Speed CAN Communication Bus (Open)" , - "U0004" => "High Speed CAN Communication Bus (Low)" , - "U0005" => "High Speed CAN Communication Bus (High)" , - "U0006" => "High Speed CAN Communication Bus (Open)" , - "U0007" => "High Speed CAN Communication Bus (Low)" , - "U0008" => "High Speed CAN Communication Bus (High)" , - "U0009" => "High Speed CAN Communication Bus (shorted to Bus)" , - "U0010" => "Medium Speed CAN Communication Bus" , - "U0011" => "Medium Speed CAN Communication Bus (Performance)" , - "U0012" => "Medium Speed CAN Communication Bus (Open)" , - "U0013" => "Medium Speed CAN Communication Bus (Low)" , - "U0014" => "Medium Speed CAN Communication Bus (High)" , - "U0015" => "Medium Speed CAN Communication Bus (Open)" , - "U0016" => "Medium Speed CAN Communication Bus (Low)" , - "U0017" => "Medium Speed CAN Communication Bus (High)" , - "U0018" => "Medium Speed CAN Communication Bus (shorted to Bus)" , - "U0019" => "Low Speed CAN Communication Bus" , - "U0020" => "Low Speed CAN Communication Bus (Performance)" , - "U0021" => "Low Speed CAN Communication Bus (Open)" , - "U0022" => "Low Speed CAN Communication Bus (Low)" , - "U0023" => "Low Speed CAN Communication Bus (High)" , - "U0024" => "Low Speed CAN Communication Bus (Open)" , - "U0025" => "Low Speed CAN Communication Bus (Low)" , - "U0026" => "Low Speed CAN Communication Bus (High)" , - "U0027" => "Low Speed CAN Communication Bus (shorted to Bus)" , - "U0028" => "Vehicle Communication Bus A" , - "U0029" => "Vehicle Communication Bus A (Performance)" , - "U0030" => "Vehicle Communication Bus A (Open)" , - "U0031" => "Vehicle Communication Bus A (Low)" , - "U0032" => "Vehicle Communication Bus A (High)" , - "U0033" => "Vehicle Communication Bus A (Open)" , - "U0034" => "Vehicle Communication Bus A (Low)" , - "U0035" => "Vehicle Communication Bus A (High)" , - "U0036" => "Vehicle Communication Bus A (shorted to Bus A)" , - "U0037" => "Vehicle Communication Bus B" , - "U0038" => "Vehicle Communication Bus B (Performance)" , - "U0039" => "Vehicle Communication Bus B (Open)" , - "U0040" => "Vehicle Communication Bus B (Low)" , - "U0041" => "Vehicle Communication Bus B (High)" , - "U0042" => "Vehicle Communication Bus B (Open)" , - "U0043" => "Vehicle Communication Bus B (Low)" , - "U0044" => "Vehicle Communication Bus B (High)" , - "U0045" => "Vehicle Communication Bus B (shorted to Bus B)" , - "U0046" => "Vehicle Communication Bus C" , - "U0047" => "Vehicle Communication Bus C (Performance)" , - "U0048" => "Vehicle Communication Bus C (Open)" , - "U0049" => "Vehicle Communication Bus C (Low)" , - "U0050" => "Vehicle Communication Bus C (High)" , - "U0051" => "Vehicle Communication Bus C (Open)" , - "U0052" => "Vehicle Communication Bus C (Low)" , - "U0053" => "Vehicle Communication Bus C (High)" , - "U0054" => "Vehicle Communication Bus C (shorted to Bus C)" , - "U0055" => "Vehicle Communication Bus D" , - "U0056" => "Vehicle Communication Bus D (Performance)" , - "U0057" => "Vehicle Communication Bus D (Open)" , - "U0058" => "Vehicle Communication Bus D (Low)" , - "U0059" => "Vehicle Communication Bus D (High)" , - "U0060" => "Vehicle Communication Bus D (Open)" , - "U0061" => "Vehicle Communication Bus D (Low)" , - "U0062" => "Vehicle Communication Bus D (High)" , - "U0063" => "Vehicle Communication Bus D (shorted to Bus D)" , - "U0064" => "Vehicle Communication Bus E" , - "U0065" => "Vehicle Communication Bus E (Performance)" , - "U0066" => "Vehicle Communication Bus E (Open)" , - "U0067" => "Vehicle Communication Bus E (Low)" , - "U0068" => "Vehicle Communication Bus E (High)" , - "U0069" => "Vehicle Communication Bus E (Open)" , - "U0070" => "Vehicle Communication Bus E (Low)" , - "U0071" => "Vehicle Communication Bus E (High)" , - "U0072" => "Vehicle Communication Bus E (shorted to Bus E)" , - "U0073" => "Control Module Communication Bus Off" , - "U0074" => "Reserved by J2012" , - "U0075" => "Reserved by J2012" , - "U0076" => "Reserved by J2012" , - "U0077" => "Reserved by J2012" , - "U0078" => "Reserved by J2012" , - "U0079" => "Reserved by J2012" , - "U0080" => "Reserved by J2012" , - "U0081" => "Reserved by J2012" , - "U0082" => "Reserved by J2012" , - "U0083" => "Reserved by J2012" , - "U0084" => "Reserved by J2012" , - "U0085" => "Reserved by J2012" , - "U0086" => "Reserved by J2012" , - "U0087" => "Reserved by J2012" , - "U0088" => "Reserved by J2012" , - "U0089" => "Reserved by J2012" , - "U0090" => "Reserved by J2012" , - "U0091" => "Reserved by J2012" , - "U0092" => "Reserved by J2012" , - "U0093" => "Reserved by J2012" , - "U0094" => "Reserved by J2012" , - "U0095" => "Reserved by J2012" , - "U0096" => "Reserved by J2012" , - "U0097" => "Reserved by J2012" , - "U0098" => "Reserved by J2012" , - "U0099" => "Reserved by J2012" , - "U0100" => "Lost Communication With ECM/PCM A" , - "U0101" => "Lost Communication with TCM" , - "U0102" => "Lost Communication with Transfer Case Control Module" , - "U0103" => "Lost Communication With Gear Shift Module" , - "U0104" => "Lost Communication With Cruise Control Module" , - "U0105" => "Lost Communication With Fuel Injector Control Module" , - "U0106" => "Lost Communication With Glow Plug Control Module" , - "U0107" => "Lost Communication With Throttle Actuator Control Module" , - "U0108" => "Lost Communication With Alternative Fuel Control Module" , - "U0109" => "Lost Communication With Fuel Pump Control Module" , - "U0110" => "Lost Communication With Drive Motor Control Module" , - "U0111" => "Lost Communication With Battery Energy Control Module 'A'" , - "U0112" => "Lost Communication With Battery Energy Control Module 'B'" , - "U0113" => "Lost Communication With Emissions Critical Control Information" , - "U0114" => "Lost Communication With Four-Wheel Drive Clutch Control Module" , - "U0115" => "Lost Communication With ECM/PCM B" , - "U0116" => "Reserved by J2012" , - "U0117" => "Reserved by J2012" , - "U0118" => "Reserved by J2012" , - "U0119" => "Reserved by J2012" , - "U0120" => "Reserved by J2012" , - "U0121" => "Lost Communication With Anti-Lock Brake System (ABS) Control Module" , - "U0122" => "Lost Communication With Vehicle Dynamics Control Module" , - "U0123" => "Lost Communication With Yaw Rate Sensor Module" , - "U0124" => "Lost Communication With Lateral Acceleration Sensor Module" , - "U0125" => "Lost Communication With Multi-axis Acceleration Sensor Module" , - "U0126" => "Lost Communication With Steering Angle Sensor Module" , - "U0127" => "Lost Communication With Tire Pressure Monitor Module" , - "U0128" => "Lost Communication With Park Brake Control Module" , - "U0129" => "Lost Communication With Brake System Control Module" , - "U0130" => "Lost Communication With Steering Effort Control Module" , - "U0131" => "Lost Communication With Power Steering Control Module" , - "U0132" => "Lost Communication With Ride Level Control Module" , - "U0133" => "Reserved by J2012" , - "U0134" => "Reserved by J2012" , - "U0135" => "Reserved by J2012" , - "U0136" => "Reserved by J2012" , - "U0137" => "Reserved by J2012" , - "U0138" => "Reserved by J2012" , - "U0139" => "Reserved by J2012" , - "U0140" => "Lost Communication With Body Control Module" , - "U0141" => "Lost Communication With Body Control Module 'A'" , - "U0142" => "Lost Communication With Body Control Module 'B'" , - "U0143" => "Lost Communication With Body Control Module 'C'" , - "U0144" => "Lost Communication With Body Control Module 'D'" , - "U0145" => "Lost Communication With Body Control Module 'E'" , - "U0146" => "Lost Communication With Gateway 'A'" , - "U0147" => "Lost Communication With Gateway 'B'" , - "U0148" => "Lost Communication With Gateway 'C'" , - "U0149" => "Lost Communication With Gateway 'D'" , - "U0150" => "Lost Communication With Gateway 'E'" , - "U0151" => "Lost Communication With Restraints Control Module" , - "U0152" => "Lost Communication With Side Restraints Control Module Left" , - "U0153" => "Lost Communication With Side Restraints Control Module Right" , - "U0154" => "Lost Communication With Restraints Occupant Sensing Control Module" , - "U0155" => "Lost Communication With Instrument Panel Cluster (IPC) Control Module" , - "U0156" => "Lost Communication With Information Center 'A'" , - "U0157" => "Lost Communication With Information Center 'B'" , - "U0158" => "Lost Communication With Head Up Display" , - "U0159" => "Lost Communication With Parking Assist Control Module" , - "U0160" => "Lost Communication With Audible Alert Control Module" , - "U0161" => "Lost Communication With Compass Module" , - "U0162" => "Lost Communication With Navigation Display Module" , - "U0163" => "Lost Communication With Navigation Control Module" , - "U0164" => "Lost Communication With HVAC Control Module" , - "U0165" => "Lost Communication With HVAC Control Module Rear" , - "U0166" => "Lost Communication With Auxiliary Heater Control Module" , - "U0167" => "Lost Communication With Vehicle Immobilizer Control Module" , - "U0168" => "Lost Communication With Vehicle Security Control Module" , - "U0169" => "Lost Communication With Sunroof Control Module" , - "U0170" => "Lost Communication With 'Restraints System Sensor A'" , - "U0171" => "Lost Communication With 'Restraints System Sensor B'" , - "U0172" => "Lost Communication With 'Restraints System Sensor C'" , - "U0173" => "Lost Communication With 'Restraints System Sensor D'" , - "U0174" => "Lost Communication With 'Restraints System Sensor E'" , - "U0175" => "Lost Communication With 'Restraints System Sensor F'" , - "U0176" => "Lost Communication With 'Restraints System Sensor G'" , - "U0177" => "Lost Communication With 'Restraints System Sensor H'" , - "U0178" => "Lost Communication With 'Restraints System Sensor I'" , - "U0179" => "Lost Communication With 'Restraints System Sensor J'" , - "U0180" => "Lost Communication With Automatic Lighting Control Module" , - "U0181" => "Lost Communication With Headlamp Leveling Control Module" , - "U0182" => "Lost Communication With Lighting Control Module Front" , - "U0183" => "Lost Communication With Lighting Control Module Rear" , - "U0184" => "Lost Communication With Radio" , - "U0185" => "Lost Communication With Antenna Control Module" , - "U0186" => "Lost Communication With Audio Amplifier" , - "U0187" => "Lost Communication With Digital Disc Player/Changer Module 'A'" , - "U0188" => "Lost Communication With Digital Disc Player/Changer Module 'B'" , - "U0189" => "Lost Communication With Digital Disc Player/Changer Module 'C'" , - "U0190" => "Lost Communication With Digital Disc Player/Changer Module 'D'" , - "U0191" => "Lost Communication With Television" , - "U0192" => "Lost Communication With Personal Computer" , - "U0193" => "Lost Communication With 'Digital Audio Control Module A'" , - "U0194" => "Lost Communication With 'Digital Audio Control Module B'" , - "U0195" => "Lost Communication With Subscription Entertainment Receiver Module" , - "U0196" => "Lost Communication With Rear Seat Entertainment Control Module" , - "U0197" => "Lost Communication With Telephone Control Module" , - "U0198" => "Lost Communication With Telematic Control Module" , - "U0199" => "Lost Communication With 'Door Control Module A'" , - "U0200" => "Lost Communication With 'Door Control Module B'" , - "U0201" => "Lost Communication With 'Door Control Module C'" , - "U0202" => "Lost Communication With 'Door Control Module D'" , - "U0203" => "Lost Communication With 'Door Control Module E'" , - "U0204" => "Lost Communication With 'Door Control Module F'" , - "U0205" => "Lost Communication With 'Door Control Module G'" , - "U0206" => "Lost Communication With Folding Top Control Module" , - "U0207" => "Lost Communication With Moveable Roof Control Module" , - "U0208" => "Lost Communication With 'Seat Control Module A'" , - "U0209" => "Lost Communication With 'Seat Control Module B'" , - "U0210" => "Lost Communication With 'Seat Control Module C'" , - "U0211" => "Lost Communication With 'Seat Control Module D'" , - "U0212" => "Lost Communication With Steering Column Control Module" , - "U0213" => "Lost Communication With Mirror Control Module" , - "U0214" => "Lost Communication With Remote Function Actuation" , - "U0215" => "Lost Communication With 'Door Switch A'" , - "U0216" => "Lost Communication With 'Door Switch B'" , - "U0217" => "Lost Communication With 'Door Switch C'" , - "U0218" => "Lost Communication With 'Door Switch D'" , - "U0219" => "Lost Communication With 'Door Switch E'" , - "U0220" => "Lost Communication With 'Door Switch F'" , - "U0221" => "Lost Communication With 'Door Switch G'" , - "U0222" => "Lost Communication With 'Door Window Motor A'" , - "U0223" => "Lost Communication With 'Door Window Motor B'" , - "U0224" => "Lost Communication With 'Door Window Motor C'" , - "U0225" => "Lost Communication With 'Door Window Motor D'" , - "U0226" => "Lost Communication With 'Door Window Motor E'" , - "U0227" => "Lost Communication With 'Door Window Motor F'" , - "U0228" => "Lost Communication With 'Door Window Motor G'" , - "U0229" => "Lost Communication With Heated Steering Wheel Module" , - "U0230" => "Lost Communication With Rear Gate Module" , - "U0231" => "Lost Communication With Rain Sensing Module" , - "U0232" => "Lost Communication With Side Obstacle Detection Control Module Left" , - "U0233" => "Lost Communication With Side Obstacle Detection Control Module Right" , - "U0234" => "Lost Communication With Convenience Recall Module" , - "U0235" => "Lost Communication With Cruise Control Front Distance Range Sensor" , - "U0300" => "Internal Control Module Software Incompatibility" , - "U0301" => "Software Incompatibility with ECM/PCM" , - "U0302" => "Software Incompatibility with Transmission Control Module" , - "U0303" => "Software Incompatibility with Transfer Case Control Module" , - "U0304" => "Software Incompatibility with Gear Shift Control Module" , - "U0305" => "Software Incompatibility with Cruise Control Module" , - "U0306" => "Software Incompatibility with Fuel Injector Control Module" , - "U0307" => "Software Incompatibility with Glow Plug Control Module" , - "U0308" => "Software Incompatibility with Throttle Actuator Control Module" , - "U0309" => "Software Incompatibility with Alternative Fuel Control Module" , - "U0310" => "Software Incompatibility with Fuel Pump Control Module" , - "U0311" => "Software Incompatibility with Drive Motor Control Module" , - "U0312" => "Software Incompatibility with Battery Energy Control Module A" , - "U0313" => "Software Incompatibility with Battery Energy Control Module B" , - "U0314" => "Software Incompatibility with Four-Wheel Drive Clutch Control Module" , - "U0315" => "Software Incompatibility with Anti-Lock Brake System Control Module" , - "U0316" => "Software Incompatibility with Vehicle Dynamics Control Module" , - "U0317" => "Software Incompatibility with Park Brake Control Module" , - "U0318" => "Software Incompatibility with Brake System Control Module" , - "U0319" => "Software Incompatibility with Steering Effort Control Module" , - "U0320" => "Software Incompatibility with Power Steering Control Module" , - "U0321" => "Software Incompatibility with Ride Level Control Module" , - "U0322" => "Software Incompatibility with Body Control Module" , - "U0323" => "Software Incompatibility with Instrument Panel Control Module" , - "U0324" => "Software Incompatibility with HVAC Control Module" , - "U0325" => "Software Incompatibility with Auxiliary Heater Control Module" , - "U0326" => "Software Incompatibility with Vehicle Immobilizer Control Module" , - "U0327" => "Software Incompatibility with Vehicle Security Control Module" , - "U0328" => "Software Incompatibility with Steering Angle Sensor Module" , - "U0329" => "Software Incompatibility with Steering Column Control Module" , - "U0330" => "Software Incompatibility with Tire Pressure Monitor Module" , - "U0331" => "Software Incompatibility with Body Control Module 'A'" , - "U0400" => "Invalid Data Received" , - "U0401" => "Invalid Data Received From ECM/PCM" , - "U0402" => "Invalid Data Received From Transmission Control Module" , - "U0403" => "Invalid Data Received From Transfer Case Control Module" , - "U0404" => "Invalid Data Received From Gear Shift Control Module" , - "U0405" => "Invalid Data Received From Cruise Control Module" , - "U0406" => "Invalid Data Received From Fuel Injector Control Module" , - "U0407" => "Invalid Data Received From Glow Plug Control Module" , - "U0408" => "Invalid Data Received From Throttle Actuator Control Module" , - "U0409" => "Invalid Data Received From Alternative Fuel Control Module" , - "U0410" => "Invalid Data Received From Fuel Pump Control Module" , - "U0411" => "Invalid Data Received From Drive Motor Control Module" , - "U0412" => "Invalid Data Received From Battery Energy Control Module A" , - "U0413" => "Invalid Data Received From Battery Energy Control Module B" , - "U0414" => "Invalid Data Received From Four-Wheel Drive Clutch Control Module" , - "U0415" => "Invalid Data Received From Anti-Lock Brake System Control Module" , - "U0416" => "Invalid Data Received From Vehicle Dynamics Control Module" , - "U0417" => "Invalid Data Received From Park Brake Control Module" , - "U0418" => "Invalid Data Received From Brake System Control Module" , - "U0419" => "Invalid Data Received From Steering Effort Control Module" , - "U0420" => "Invalid Data Received From Power Steering Control Module" , - "U0421" => "Invalid Data Received From Ride Level Control Module" , - "U0422" => "Invalid Data Received From Body Control Module" , - "U0423" => "Invalid Data Received From Instrument Panel Control Module" , - "U0424" => "Invalid Data Received From HVAC Control Module" , - "U0425" => "Invalid Data Received From Auxiliary Heater Control Module" , - "U0426" => "Invalid Data Received From Vehicle Immobilizer Control Module" , - "U0427" => "Invalid Data Received From Vehicle Security Control Module" , - "U0428" => "Invalid Data Received From Steering Angle Sensor Module" , - "U0429" => "Invalid Data Received From Steering Column Control Module" , - "U0430" => "Invalid Data Received From Tire Pressure Monitor Module" , + "U0001" => "High Speed CAN Communication Bus", + "U0002" => "High Speed CAN Communication Bus (Performance)", + "U0003" => "High Speed CAN Communication Bus (Open)", + "U0004" => "High Speed CAN Communication Bus (Low)", + "U0005" => "High Speed CAN Communication Bus (High)", + "U0006" => "High Speed CAN Communication Bus (Open)", + "U0007" => "High Speed CAN Communication Bus (Low)", + "U0008" => "High Speed CAN Communication Bus (High)", + "U0009" => "High Speed CAN Communication Bus (shorted to Bus)", + "U0010" => "Medium Speed CAN Communication Bus", + "U0011" => "Medium Speed CAN Communication Bus (Performance)", + "U0012" => "Medium Speed CAN Communication Bus (Open)", + "U0013" => "Medium Speed CAN Communication Bus (Low)", + "U0014" => "Medium Speed CAN Communication Bus (High)", + "U0015" => "Medium Speed CAN Communication Bus (Open)", + "U0016" => "Medium Speed CAN Communication Bus (Low)", + "U0017" => "Medium Speed CAN Communication Bus (High)", + "U0018" => "Medium Speed CAN Communication Bus (shorted to Bus)", + "U0019" => "Low Speed CAN Communication Bus", + "U0020" => "Low Speed CAN Communication Bus (Performance)", + "U0021" => "Low Speed CAN Communication Bus (Open)", + "U0022" => "Low Speed CAN Communication Bus (Low)", + "U0023" => "Low Speed CAN Communication Bus (High)", + "U0024" => "Low Speed CAN Communication Bus (Open)", + "U0025" => "Low Speed CAN Communication Bus (Low)", + "U0026" => "Low Speed CAN Communication Bus (High)", + "U0027" => "Low Speed CAN Communication Bus (shorted to Bus)", + "U0028" => "Vehicle Communication Bus A", + "U0029" => "Vehicle Communication Bus A (Performance)", + "U0030" => "Vehicle Communication Bus A (Open)", + "U0031" => "Vehicle Communication Bus A (Low)", + "U0032" => "Vehicle Communication Bus A (High)", + "U0033" => "Vehicle Communication Bus A (Open)", + "U0034" => "Vehicle Communication Bus A (Low)", + "U0035" => "Vehicle Communication Bus A (High)", + "U0036" => "Vehicle Communication Bus A (shorted to Bus A)", + "U0037" => "Vehicle Communication Bus B", + "U0038" => "Vehicle Communication Bus B (Performance)", + "U0039" => "Vehicle Communication Bus B (Open)", + "U0040" => "Vehicle Communication Bus B (Low)", + "U0041" => "Vehicle Communication Bus B (High)", + "U0042" => "Vehicle Communication Bus B (Open)", + "U0043" => "Vehicle Communication Bus B (Low)", + "U0044" => "Vehicle Communication Bus B (High)", + "U0045" => "Vehicle Communication Bus B (shorted to Bus B)", + "U0046" => "Vehicle Communication Bus C", + "U0047" => "Vehicle Communication Bus C (Performance)", + "U0048" => "Vehicle Communication Bus C (Open)", + "U0049" => "Vehicle Communication Bus C (Low)", + "U0050" => "Vehicle Communication Bus C (High)", + "U0051" => "Vehicle Communication Bus C (Open)", + "U0052" => "Vehicle Communication Bus C (Low)", + "U0053" => "Vehicle Communication Bus C (High)", + "U0054" => "Vehicle Communication Bus C (shorted to Bus C)", + "U0055" => "Vehicle Communication Bus D", + "U0056" => "Vehicle Communication Bus D (Performance)", + "U0057" => "Vehicle Communication Bus D (Open)", + "U0058" => "Vehicle Communication Bus D (Low)", + "U0059" => "Vehicle Communication Bus D (High)", + "U0060" => "Vehicle Communication Bus D (Open)", + "U0061" => "Vehicle Communication Bus D (Low)", + "U0062" => "Vehicle Communication Bus D (High)", + "U0063" => "Vehicle Communication Bus D (shorted to Bus D)", + "U0064" => "Vehicle Communication Bus E", + "U0065" => "Vehicle Communication Bus E (Performance)", + "U0066" => "Vehicle Communication Bus E (Open)", + "U0067" => "Vehicle Communication Bus E (Low)", + "U0068" => "Vehicle Communication Bus E (High)", + "U0069" => "Vehicle Communication Bus E (Open)", + "U0070" => "Vehicle Communication Bus E (Low)", + "U0071" => "Vehicle Communication Bus E (High)", + "U0072" => "Vehicle Communication Bus E (shorted to Bus E)", + "U0073" => "Control Module Communication Bus Off", + "U0074" => "Reserved by J2012", + "U0075" => "Reserved by J2012", + "U0076" => "Reserved by J2012", + "U0077" => "Reserved by J2012", + "U0078" => "Reserved by J2012", + "U0079" => "Reserved by J2012", + "U0080" => "Reserved by J2012", + "U0081" => "Reserved by J2012", + "U0082" => "Reserved by J2012", + "U0083" => "Reserved by J2012", + "U0084" => "Reserved by J2012", + "U0085" => "Reserved by J2012", + "U0086" => "Reserved by J2012", + "U0087" => "Reserved by J2012", + "U0088" => "Reserved by J2012", + "U0089" => "Reserved by J2012", + "U0090" => "Reserved by J2012", + "U0091" => "Reserved by J2012", + "U0092" => "Reserved by J2012", + "U0093" => "Reserved by J2012", + "U0094" => "Reserved by J2012", + "U0095" => "Reserved by J2012", + "U0096" => "Reserved by J2012", + "U0097" => "Reserved by J2012", + "U0098" => "Reserved by J2012", + "U0099" => "Reserved by J2012", + "U0100" => "Lost Communication With ECM/PCM A", + "U0101" => "Lost Communication with TCM", + "U0102" => "Lost Communication with Transfer Case Control Module", + "U0103" => "Lost Communication With Gear Shift Module", + "U0104" => "Lost Communication With Cruise Control Module", + "U0105" => "Lost Communication With Fuel Injector Control Module", + "U0106" => "Lost Communication With Glow Plug Control Module", + "U0107" => "Lost Communication With Throttle Actuator Control Module", + "U0108" => "Lost Communication With Alternative Fuel Control Module", + "U0109" => "Lost Communication With Fuel Pump Control Module", + "U0110" => "Lost Communication With Drive Motor Control Module", + "U0111" => "Lost Communication With Battery Energy Control Module 'A'", + "U0112" => "Lost Communication With Battery Energy Control Module 'B'", + "U0113" => "Lost Communication With Emissions Critical Control Information", + "U0114" => "Lost Communication With Four-Wheel Drive Clutch Control Module", + "U0115" => "Lost Communication With ECM/PCM B", + "U0116" => "Reserved by J2012", + "U0117" => "Reserved by J2012", + "U0118" => "Reserved by J2012", + "U0119" => "Reserved by J2012", + "U0120" => "Reserved by J2012", + "U0121" => "Lost Communication With Anti-Lock Brake System (ABS) Control Module", + "U0122" => "Lost Communication With Vehicle Dynamics Control Module", + "U0123" => "Lost Communication With Yaw Rate Sensor Module", + "U0124" => "Lost Communication With Lateral Acceleration Sensor Module", + "U0125" => "Lost Communication With Multi-axis Acceleration Sensor Module", + "U0126" => "Lost Communication With Steering Angle Sensor Module", + "U0127" => "Lost Communication With Tire Pressure Monitor Module", + "U0128" => "Lost Communication With Park Brake Control Module", + "U0129" => "Lost Communication With Brake System Control Module", + "U0130" => "Lost Communication With Steering Effort Control Module", + "U0131" => "Lost Communication With Power Steering Control Module", + "U0132" => "Lost Communication With Ride Level Control Module", + "U0133" => "Reserved by J2012", + "U0134" => "Reserved by J2012", + "U0135" => "Reserved by J2012", + "U0136" => "Reserved by J2012", + "U0137" => "Reserved by J2012", + "U0138" => "Reserved by J2012", + "U0139" => "Reserved by J2012", + "U0140" => "Lost Communication With Body Control Module", + "U0141" => "Lost Communication With Body Control Module 'A'", + "U0142" => "Lost Communication With Body Control Module 'B'", + "U0143" => "Lost Communication With Body Control Module 'C'", + "U0144" => "Lost Communication With Body Control Module 'D'", + "U0145" => "Lost Communication With Body Control Module 'E'", + "U0146" => "Lost Communication With Gateway 'A'", + "U0147" => "Lost Communication With Gateway 'B'", + "U0148" => "Lost Communication With Gateway 'C'", + "U0149" => "Lost Communication With Gateway 'D'", + "U0150" => "Lost Communication With Gateway 'E'", + "U0151" => "Lost Communication With Restraints Control Module", + "U0152" => "Lost Communication With Side Restraints Control Module Left", + "U0153" => "Lost Communication With Side Restraints Control Module Right", + "U0154" => "Lost Communication With Restraints Occupant Sensing Control Module", + "U0155" => "Lost Communication With Instrument Panel Cluster (IPC) Control Module", + "U0156" => "Lost Communication With Information Center 'A'", + "U0157" => "Lost Communication With Information Center 'B'", + "U0158" => "Lost Communication With Head Up Display", + "U0159" => "Lost Communication With Parking Assist Control Module", + "U0160" => "Lost Communication With Audible Alert Control Module", + "U0161" => "Lost Communication With Compass Module", + "U0162" => "Lost Communication With Navigation Display Module", + "U0163" => "Lost Communication With Navigation Control Module", + "U0164" => "Lost Communication With HVAC Control Module", + "U0165" => "Lost Communication With HVAC Control Module Rear", + "U0166" => "Lost Communication With Auxiliary Heater Control Module", + "U0167" => "Lost Communication With Vehicle Immobilizer Control Module", + "U0168" => "Lost Communication With Vehicle Security Control Module", + "U0169" => "Lost Communication With Sunroof Control Module", + "U0170" => "Lost Communication With 'Restraints System Sensor A'", + "U0171" => "Lost Communication With 'Restraints System Sensor B'", + "U0172" => "Lost Communication With 'Restraints System Sensor C'", + "U0173" => "Lost Communication With 'Restraints System Sensor D'", + "U0174" => "Lost Communication With 'Restraints System Sensor E'", + "U0175" => "Lost Communication With 'Restraints System Sensor F'", + "U0176" => "Lost Communication With 'Restraints System Sensor G'", + "U0177" => "Lost Communication With 'Restraints System Sensor H'", + "U0178" => "Lost Communication With 'Restraints System Sensor I'", + "U0179" => "Lost Communication With 'Restraints System Sensor J'", + "U0180" => "Lost Communication With Automatic Lighting Control Module", + "U0181" => "Lost Communication With Headlamp Leveling Control Module", + "U0182" => "Lost Communication With Lighting Control Module Front", + "U0183" => "Lost Communication With Lighting Control Module Rear", + "U0184" => "Lost Communication With Radio", + "U0185" => "Lost Communication With Antenna Control Module", + "U0186" => "Lost Communication With Audio Amplifier", + "U0187" => "Lost Communication With Digital Disc Player/Changer Module 'A'", + "U0188" => "Lost Communication With Digital Disc Player/Changer Module 'B'", + "U0189" => "Lost Communication With Digital Disc Player/Changer Module 'C'", + "U0190" => "Lost Communication With Digital Disc Player/Changer Module 'D'", + "U0191" => "Lost Communication With Television", + "U0192" => "Lost Communication With Personal Computer", + "U0193" => "Lost Communication With 'Digital Audio Control Module A'", + "U0194" => "Lost Communication With 'Digital Audio Control Module B'", + "U0195" => "Lost Communication With Subscription Entertainment Receiver Module", + "U0196" => "Lost Communication With Rear Seat Entertainment Control Module", + "U0197" => "Lost Communication With Telephone Control Module", + "U0198" => "Lost Communication With Telematic Control Module", + "U0199" => "Lost Communication With 'Door Control Module A'", + "U0200" => "Lost Communication With 'Door Control Module B'", + "U0201" => "Lost Communication With 'Door Control Module C'", + "U0202" => "Lost Communication With 'Door Control Module D'", + "U0203" => "Lost Communication With 'Door Control Module E'", + "U0204" => "Lost Communication With 'Door Control Module F'", + "U0205" => "Lost Communication With 'Door Control Module G'", + "U0206" => "Lost Communication With Folding Top Control Module", + "U0207" => "Lost Communication With Moveable Roof Control Module", + "U0208" => "Lost Communication With 'Seat Control Module A'", + "U0209" => "Lost Communication With 'Seat Control Module B'", + "U0210" => "Lost Communication With 'Seat Control Module C'", + "U0211" => "Lost Communication With 'Seat Control Module D'", + "U0212" => "Lost Communication With Steering Column Control Module", + "U0213" => "Lost Communication With Mirror Control Module", + "U0214" => "Lost Communication With Remote Function Actuation", + "U0215" => "Lost Communication With 'Door Switch A'", + "U0216" => "Lost Communication With 'Door Switch B'", + "U0217" => "Lost Communication With 'Door Switch C'", + "U0218" => "Lost Communication With 'Door Switch D'", + "U0219" => "Lost Communication With 'Door Switch E'", + "U0220" => "Lost Communication With 'Door Switch F'", + "U0221" => "Lost Communication With 'Door Switch G'", + "U0222" => "Lost Communication With 'Door Window Motor A'", + "U0223" => "Lost Communication With 'Door Window Motor B'", + "U0224" => "Lost Communication With 'Door Window Motor C'", + "U0225" => "Lost Communication With 'Door Window Motor D'", + "U0226" => "Lost Communication With 'Door Window Motor E'", + "U0227" => "Lost Communication With 'Door Window Motor F'", + "U0228" => "Lost Communication With 'Door Window Motor G'", + "U0229" => "Lost Communication With Heated Steering Wheel Module", + "U0230" => "Lost Communication With Rear Gate Module", + "U0231" => "Lost Communication With Rain Sensing Module", + "U0232" => "Lost Communication With Side Obstacle Detection Control Module Left", + "U0233" => "Lost Communication With Side Obstacle Detection Control Module Right", + "U0234" => "Lost Communication With Convenience Recall Module", + "U0235" => "Lost Communication With Cruise Control Front Distance Range Sensor", + "U0300" => "Internal Control Module Software Incompatibility", + "U0301" => "Software Incompatibility with ECM/PCM", + "U0302" => "Software Incompatibility with Transmission Control Module", + "U0303" => "Software Incompatibility with Transfer Case Control Module", + "U0304" => "Software Incompatibility with Gear Shift Control Module", + "U0305" => "Software Incompatibility with Cruise Control Module", + "U0306" => "Software Incompatibility with Fuel Injector Control Module", + "U0307" => "Software Incompatibility with Glow Plug Control Module", + "U0308" => "Software Incompatibility with Throttle Actuator Control Module", + "U0309" => "Software Incompatibility with Alternative Fuel Control Module", + "U0310" => "Software Incompatibility with Fuel Pump Control Module", + "U0311" => "Software Incompatibility with Drive Motor Control Module", + "U0312" => "Software Incompatibility with Battery Energy Control Module A", + "U0313" => "Software Incompatibility with Battery Energy Control Module B", + "U0314" => "Software Incompatibility with Four-Wheel Drive Clutch Control Module", + "U0315" => "Software Incompatibility with Anti-Lock Brake System Control Module", + "U0316" => "Software Incompatibility with Vehicle Dynamics Control Module", + "U0317" => "Software Incompatibility with Park Brake Control Module", + "U0318" => "Software Incompatibility with Brake System Control Module", + "U0319" => "Software Incompatibility with Steering Effort Control Module", + "U0320" => "Software Incompatibility with Power Steering Control Module", + "U0321" => "Software Incompatibility with Ride Level Control Module", + "U0322" => "Software Incompatibility with Body Control Module", + "U0323" => "Software Incompatibility with Instrument Panel Control Module", + "U0324" => "Software Incompatibility with HVAC Control Module", + "U0325" => "Software Incompatibility with Auxiliary Heater Control Module", + "U0326" => "Software Incompatibility with Vehicle Immobilizer Control Module", + "U0327" => "Software Incompatibility with Vehicle Security Control Module", + "U0328" => "Software Incompatibility with Steering Angle Sensor Module", + "U0329" => "Software Incompatibility with Steering Column Control Module", + "U0330" => "Software Incompatibility with Tire Pressure Monitor Module", + "U0331" => "Software Incompatibility with Body Control Module 'A'", + "U0400" => "Invalid Data Received", + "U0401" => "Invalid Data Received From ECM/PCM", + "U0402" => "Invalid Data Received From Transmission Control Module", + "U0403" => "Invalid Data Received From Transfer Case Control Module", + "U0404" => "Invalid Data Received From Gear Shift Control Module", + "U0405" => "Invalid Data Received From Cruise Control Module", + "U0406" => "Invalid Data Received From Fuel Injector Control Module", + "U0407" => "Invalid Data Received From Glow Plug Control Module", + "U0408" => "Invalid Data Received From Throttle Actuator Control Module", + "U0409" => "Invalid Data Received From Alternative Fuel Control Module", + "U0410" => "Invalid Data Received From Fuel Pump Control Module", + "U0411" => "Invalid Data Received From Drive Motor Control Module", + "U0412" => "Invalid Data Received From Battery Energy Control Module A", + "U0413" => "Invalid Data Received From Battery Energy Control Module B", + "U0414" => "Invalid Data Received From Four-Wheel Drive Clutch Control Module", + "U0415" => "Invalid Data Received From Anti-Lock Brake System Control Module", + "U0416" => "Invalid Data Received From Vehicle Dynamics Control Module", + "U0417" => "Invalid Data Received From Park Brake Control Module", + "U0418" => "Invalid Data Received From Brake System Control Module", + "U0419" => "Invalid Data Received From Steering Effort Control Module", + "U0420" => "Invalid Data Received From Power Steering Control Module", + "U0421" => "Invalid Data Received From Ride Level Control Module", + "U0422" => "Invalid Data Received From Body Control Module", + "U0423" => "Invalid Data Received From Instrument Panel Control Module", + "U0424" => "Invalid Data Received From HVAC Control Module", + "U0425" => "Invalid Data Received From Auxiliary Heater Control Module", + "U0426" => "Invalid Data Received From Vehicle Immobilizer Control Module", + "U0427" => "Invalid Data Received From Vehicle Security Control Module", + "U0428" => "Invalid Data Received From Steering Angle Sensor Module", + "U0429" => "Invalid Data Received From Steering Column Control Module", + "U0430" => "Invalid Data Received From Tire Pressure Monitor Module", "U0431" => "Invalid Data Received From Body Control Module 'A'" } diff --git a/lib/msf/core/post/hardware/zigbee/utils.rb b/lib/msf/core/post/hardware/zigbee/utils.rb index d5a59dd0cbdf..41dd88ebcdcf 100644 --- a/lib/msf/core/post/hardware/zigbee/utils.rb +++ b/lib/msf/core/post/hardware/zigbee/utils.rb @@ -220,26 +220,26 @@ def dot154_packet_decode(packet) daddr_mask = (fcf & DOT154_FCF_DADDR_MASK) >> 10 if daddr_mask == DOT154_FCF_ADDR_EXT pktchop[3] = packet[offset,8] - offset+=8 + offset += 8 elsif daddr_mask == DOT154_FCF_ADDR_SHORT pktchop[3] = packet[offset,2] - offset+=2 + offset += 2 end # Examine the Intra-PAN flag if (fcf & DOT154_FCF_INTRA_PAN) == 0 pktchop[4] = packet[offset,2] - offset+=2 + offset += 2 end # Examine the source addressing mode saddr_mask = (fcf & DOT154_FCF_SADDR_MASK) >> 14 if daddr_mask == DOT154_FCF_ADDR_EXT pktchop[5] = packet[offset,8] - offset+=8 + offset += 8 elsif daddr_mask == DOT154_FCF_ADDR_SHORT pktchop[5] = packet[offset,2] - offset+=2 + offset += 2 end end # Append remaining payload diff --git a/lib/rex/post/hwbridge/extensions/automotive/uds_errors.rb b/lib/rex/post/hwbridge/extensions/automotive/uds_errors.rb index 8b7fe6503bb4..2f72dc751fc2 100644 --- a/lib/rex/post/hwbridge/extensions/automotive/uds_errors.rb +++ b/lib/rex/post/hwbridge/extensions/automotive/uds_errors.rb @@ -117,7 +117,7 @@ module UDSErrors "SLNIP" => "Shifter Lever Not In Park", "TCCL" => "Torque Converter Clutch Locked", "VTH" => "Voltage Too High", - "VTL" => "Voltage Too Low" + "VTL" => "Voltage Too Low" } end diff --git a/lib/rex/post/hwbridge/ui/console/command_dispatcher/automotive.rb b/lib/rex/post/hwbridge/ui/console/command_dispatcher/automotive.rb index a8a309d43155..b2a3a275c961 100644 --- a/lib/rex/post/hwbridge/ui/console/command_dispatcher/automotive.rb +++ b/lib/rex/post/hwbridge/ui/console/command_dispatcher/automotive.rb @@ -222,8 +222,8 @@ def cmd_isotpsend(*args) return result end opt = {} - opt['TIMEOUT'] = timeout if not timeout.nil? - opt['MAXPKTS'] = maxpackets if not maxpackets.nil? + opt['TIMEOUT'] = timeout unless timeout.nil? + opt['MAXPKTS'] = maxpackets unless maxpackets.nil? result = client.automotive.send_isotp_and_wait_for_response(bus, id, ret, bytes, opt) if result.key? 'Packets' result['Packets'].each do |pkt| @@ -269,7 +269,7 @@ def cmd_testerpresent(*args) return end if id.blank? && !stop - if self.tpjobs.size > 0 + if self.tpjobs.size.positive? print_line("TesterPresent is currently active") self.tpjobs.each_index do |jid| if self.tpjobs[jid] diff --git a/lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb b/lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb index 671cbfd6c0ce..c777f28080ce 100644 --- a/lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb +++ b/lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb @@ -84,7 +84,7 @@ def cmd_sessions_help end def cmd_sessions(*args) - if args.length == 0 || args[0].to_i == 0 + if args.length.zero? || args[0].to_i.zero? cmd_sessions_help elsif args[0].to_s == client.name.to_s print_status("Session #{client.name} is already interactive.") @@ -185,7 +185,7 @@ def cmd_info(*args) if mod print_line(::Msf::Serializer::ReadableText.dump_module(mod)) mod_opt = ::Msf::Serializer::ReadableText.dump_options(mod, ' ') - print_line("\nModule options (#{mod.fullname}):\n\n#{mod_opt}") if mod_opt && mod_opt.length > 0 + print_line("\nModule options (#{mod.fullname}):\n\n#{mod_opt}") if mod_opt && mod_opt.length.positive? end end @@ -204,7 +204,7 @@ def cmd_status_help # Get the HW bridge devices status # def cmd_status(*args) - if args.length > 0 + if args.length.positive? cmd_status_help return true end @@ -235,7 +235,7 @@ def cmd_specialty_help # Get the Hardware specialty # def cmd_specialty(*args) - if args.length > 0 + if args.length.positive? cmd_specialty_help return true end @@ -251,7 +251,7 @@ def cmd_reset_help # Performs a device reset or factory reset # def cmd_reset(*args) - if args.length > 0 + if args.length.positive? cmd_reset_help return end @@ -268,7 +268,7 @@ def cmd_reboot_help # Perform a device reboot # def cmd_reboot(*args) - if args.length > 0 + if args.length.positive? cmd_reboot_help return end @@ -286,7 +286,7 @@ def cmd_load_custom_methods_help # Loads custom methods if any exist # def cmd_load_custom_methods(*args) - if args.length > 0 + if args.length.positive? cmd_load_custom_methods_help return true end @@ -294,7 +294,7 @@ def cmd_load_custom_methods(*args) if res.has_key? 'Methods' cmd_load("custom_methods") self.shell.dispatcher_stack.each do |dispatcher| - if dispatcher.name =~/custom methods/i + if dispatcher.name =~ /custom methods/i dispatcher.load_methods(res['Methods']) end end @@ -315,7 +315,7 @@ def cmd_load_help # Loads one or more meterpreter extensions. # def cmd_load(*args) - if args.length == 0 + if args.length.zero? args.unshift("-h") end @@ -369,7 +369,7 @@ def cmd_run_help # Executes a script in the context of the hwbridge session. # def cmd_run(*args) - if args.length == 0 + if args.length.zero? cmd_run_help return true end @@ -423,7 +423,7 @@ def cmd_run_tabs(str, words) next unless ::File.exist? dir tabs += ::Dir.new(dir).find_all { |e| path = dir + ::File::SEPARATOR + e - ::File.file?(path) and ::File.readable?(path) + ::File.file?(path) && ::File.readable?(path) } end rescue Exception @@ -436,7 +436,7 @@ def cmd_run_tabs(str, words) # Executes a script in the context of the hardware bridge session in the background # def cmd_bgrun(*args) - if args.length == 0 + if args.length.zero? print_line( "Usage: bgrun