Fixed defaults for elm327 realy.

Array2Hex in the automotive extension how supports passing an array or integers or string hexes
Added some extra error handling for UDS calls to non-supported pids

Author: zombieCraig

lib/msf/core/post/hardware/automotive/uds.rb

@@ -496,6 +496,7 @@ def get_vin(bus, srcId, dstId)
     packets = get_vehicle_info(bus, srcId, dstId, 0x02)
     return "UDS ERR: #{packets["error"]}" if packets.has_key? "error"
     data = response_hash_to_data_array(dstId.to_s(16), packets)
+    return "" if data == nil
     data.map! { |d| d.hex.chr }
     data.join
   end
@@ -511,6 +512,7 @@ def get_calibration_id(bus, srcId, dstId)
     packets = get_vehicle_info(bus, srcId, dstId, 0x04)
     return "UDS ERR: #{packets["error"]}" if packets.has_key? "error"
     data = response_hash_to_data_array(dstId.to_s(16), packets)
+    return "" if data == nil
     data.map! { |d| d.hex.chr }
     data.join
   end
@@ -526,6 +528,7 @@ def get_ecu_name(bus, srcId, dstId)
     packets = get_vehicle_info(bus, srcId, dstId, 0x0A)
     return "UDS ERR: #{packets["error"]}" if packets.has_key? "error"
     data = response_hash_to_data_array(dstId.to_s(16), packets)
+    return "" if data == nil
     data.map! { |d| d.hex.chr }
     data.join
   end

lib/rex/post/hwbridge/extensions/automotive/automotive.rb

@@ -77,7 +77,8 @@ def check_for_errors(data)
   #
   # @return [Array] Array of Hex string equivalents
   def array2hex(arr)
-    arr.map { |b| "%02x" % b.hex }
+    # We give the flexibility of sending Integers or string hexes in the array
+    arr.map { |b| "%02x" % (b.respond_to?("hex") ? b.hex : b )}
   end
 
   def set_active_bus(bus)

tools/hardware/elm327_relay.rb

@@ -71,6 +71,9 @@ class ELM327Relay < Msf::Auxiliary
     attr_accessor :serial_stop_bits
 
     def initialize(info={})
+      # Set some defaults
+      self.serial_port = "/dev/ttyUSB0"
+      self.serial_baud = 115200
       begin
         @opts = OptsConsole.parse(ARGV)
       rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
@@ -99,8 +102,8 @@ def initialize(info={})
          {
             'URIPATH' => "/" 
           }))
-       self.serial_port = @opts[:serial]
-       self.serial_baud = @opts[:baud].to_i
+       self.serial_port = @opts[:serial] if @opts.has_key? :serial
+       self.serial_baud = @opts[:baud].to_i if @opts.has_key? :baud
        self.serial_bits = 8
        self.serial_stop_bits = 1
        @operational_status = 0