Rename to more intention-revealing name

Author: egypt

lib/msf/core/encoded_payload.rb

@@ -23,7 +23,7 @@ def self.create(pinst, reqs = {})
     p = EncodedPayload.new(pinst.framework, pinst, reqs)
 
     p.generate(reqs['Raw'])
-    
+
     return p
   end
 
@@ -59,7 +59,7 @@ def generate(raw = nil)
     if (priority == 0)
       Thread.current.priority = 1
     end
-    
+
     begin
       # First, validate
       pinst.validate()
@@ -115,6 +115,7 @@ def encode
       if reqs['Encoder']
         reqs['Encoder'] = reqs['Encoder'].encode(framework.encoders.keys[0].encoding)
       end
+
       # If the caller had a preferred encoder, use this encoder only
       if ((reqs['Encoder']) and (preferred = framework.encoders[reqs['Encoder']]))
         encoders = [ [reqs['Encoder'], preferred] ]
@@ -166,7 +167,7 @@ def encode
         if (reqs['ForceSaveRegisters'] and
             reqs['EncoderOptions'] and
             (reqs['EncoderOptions']['SaveRegisters'].to_s.length > 0) and
-            (! self.encoder.preserves_registers?))
+            (! self.encoder.can_preserve_registers?))
           wlog("#{pinst.refname}: Encoder #{encoder.refname} does not preserve registers and the caller needs #{reqs['EncoderOptions']['SaveRegisters']} preserved.",
             'core', LEV_1)
           next
@@ -238,10 +239,11 @@ def encode
         self.encoded = eout
         break
       }
+
       # If the encoded payload is nil, raise an exception saying that we
       # suck at life.
       if (self.encoded == nil)
-        self.encoder = nil        
+        self.encoder = nil
         raise NoEncodersSucceededError,
           "#{pinst.refname}: All encoders failed to encode.",
           caller

lib/msf/core/encoder.rb

@@ -400,7 +400,7 @@ def to_native(buf)
   #
   # Determines whether the encoder can preserve registers at all
   #
-  def preserves_registers?
+  def can_preserve_registers?
     false
   end
 

modules/encoders/x86/call4_dword_xor.rb

@@ -51,7 +51,7 @@ def decoder_stub(state)
   end
 
   # Indicate that this module can preserve some registers
-  def preserves_registers?
+  def can_preserve_registers?
     true
   end
 

modules/encoders/x86/countdown.rb

@@ -64,7 +64,7 @@ def encode_block(state, block)
   end
 
   # Indicate that this module can preserve some registers
-  def preserves_registers?
+  def can_preserve_registers?
     true
   end
 

modules/encoders/x86/fnstenv_mov.rb

@@ -55,7 +55,7 @@ def decoder_stub(state)
   end
 
   # Indicate that this module can preserve some registers
-  def preserves_registers?
+  def can_preserve_registers?
     true
   end
 

modules/encoders/x86/shikata_ga_nai.rb

@@ -69,7 +69,7 @@ def decoder_stub(state)
   end
 
   # Indicate that this module can preserve some registers
-  def preserves_registers?
+  def can_preserve_registers?
     true
   end