Land #11101, temp fix for x64/xor stage encoder

Merge branch 'land-11101' into upstream-master

modules/encoders/x64/xor_dynamic.rb

@@ -15,6 +15,14 @@ class MetasploitModule < Msf::Encoder::XorDynamic
       )
   end
 
+  # Indicate that this module can preserve some registers
+  # ...which is currently not true. This is a temp fix
+  # until the full preserve_registers functionality is
+  # implemented.
+  def can_preserve_registers?
+    true
+  end
+
   def stub
     "\xeb\x27" +             #        jmp    _call
     "\x5b" +                 # _ret:  pop    rbx

modules/encoders/x86/xor_dynamic.rb

@@ -15,6 +15,14 @@ class MetasploitModule < Msf::Encoder::XorDynamic
       )
   end
 
+  # Indicate that this module can preserve some registers
+  # ...which is currently not true. This is a temp fix
+  # until the full preserve_registers functionality is
+  # implemented.
+  def can_preserve_registers?
+    true
+  end
+
   def stub
     "\xeb\x23" +             #        jmp    _call
     "\x5b" +                 # _ret:  pop    ebx