Merge remote-tracking branch 'wchen-r7/encoder_fixes' into rapid7

Author: egypt

lib/rex/encoder/alpha2/unicode_mixed.rb

@@ -39,7 +39,12 @@ def self.gen_decoder_prefix(reg, offset)
 			'EDI'   => 'WWYA' + mod,         # push edi, pop edi
 		}
 
-		return regprefix[reg]	
+		prefix = regprefix[reg.upcase]
+		if prefix.nil?
+			raise "Critical: Invalid register"
+		end
+
+		return prefix
 	end
 
 	def self.gen_decoder(reg, offset)

msfvenom

@@ -369,7 +369,7 @@ if opts[:encode]
 		next if not enc
 		begin
 			break if done
-			#enc.datastore.import_options_from_s(datastore, '_|_')
+			enc.datastore.import_options_from_hash(datastore)
 			skip = false
 			raw = nil