Use #compatible_payloads in #validate

This updates the #validate methods to check if the selected payload is
in the modules list of compatible payloads instead of just checking the
platform.

lib/msf/core/evasion_driver.rb

@@ -38,8 +38,7 @@ def target_idx
   # current evasion module.  Assumes that target_idx is valid.
   #
   def compatible_payload?(payload)
-    evasion_platform = evasion.targets[target_idx].platform || evasion.platform
-    return ((payload.platform & evasion_platform).empty? == false)
+    !evasion.compatible_payloads.find { |refname, _| refname == payload.refname }.nil?
   end
 
   def validate
@@ -48,7 +47,7 @@ def validate
     end
 
     # Make sure the payload is compatible after all
-    if (compatible_payload?(payload) == false)
+    unless compatible_payload?(payload)
       raise IncompatiblePayloadError.new(payload.refname), "#{payload.refname} is not a compatible payload.", caller
     end
 

lib/msf/core/exploit_driver.rb

@@ -52,10 +52,7 @@ def target_idx
   # current exploit.  Assumes that target_idx is valid.
   #
   def compatible_payload?(payload)
-    # Try to use the target's platform in preference of the exploit's
-    exp_platform = exploit.targets[target_idx].platform || exploit.platform
-
-    return ((payload.platform & exp_platform).empty? == false)
+    !exploit.compatible_payloads.find { |refname, _| refname == payload.refname }.nil?
   end
 
   ##
@@ -83,9 +80,8 @@ def validate
     end
 
     # Make sure the payload is compatible after all
-    if (compatible_payload?(payload) == false)
-      raise IncompatiblePayloadError.new(payload.refname),
-        "#{payload.refname} is not a compatible payload.", caller
+    unless compatible_payload?(payload)
+      raise IncompatiblePayloadError.new(payload.refname), "#{payload.refname} is not a compatible payload.", caller
     end
 
     unless exploit.respond_to?(:allow_no_cleanup) && exploit.allow_no_cleanup