Land #5196, fix incorrect yardoc annotations

lib/msf/core/exploit.rb

@@ -1224,7 +1224,7 @@ class Exploit < Msf::Module
   # @param reason [String] A constant from Msf::Module::Failure.
   #                        If the reason does not come from there, then it will default to
   #                        Msf::Module::Failure::Unknown.
-  # @param mssg [String] (Optional) A message about the failure.
+  # @param msg [String] (Optional) A message about the failure.
   # @raise [Msf::Exploit::Failed] A custom Msf::Exploit::Failed exception.
   # @return [void]
   # @see Msf::Module::Failure

lib/msf/core/payload/uuid.rb

@@ -86,13 +86,13 @@ class Msf::Payload::UUID
   #
   # Generate a raw 16-byte payload UUID given a seed, platform, architecture, and timestamp
   #
-  # @options opts [String] :seed An optional string to use for generated the unique payload ID, deterministic
-  # @options opts [String] :puid An optional 8-byte string to use as the unique payload ID
-  # @options opts [String] :arch The hardware architecture for this payload
-  # @options opts [String] :platform The operating system platform for this payload
-  # @options opts [String] :timestamp The timestamp in UTC Unix epoch format
-  # @options opts [Fixnum] :xor1 An optional 8-bit XOR ID for obfuscation
-  # @options opts [Fixnum] :xor2 An optional 8-bit XOR ID for obfuscation
+  # @option opts [String] :seed An optional string to use for generated the unique payload ID, deterministic
+  # @option opts [String] :puid An optional 8-byte string to use as the unique payload ID
+  # @option opts [String] :arch The hardware architecture for this payload
+  # @option opts [String] :platform The operating system platform for this payload
+  # @option opts [String] :timestamp The timestamp in UTC Unix epoch format
+  # @option opts [Fixnum] :xor1 An optional 8-bit XOR ID for obfuscation
+  # @option opts [Fixnum] :xor2 An optional 8-bit XOR ID for obfuscation
   # @return [String] The encoded payoad UUID as a binary string
   #
   def self.generate_raw(opts={})

lib/msf/java/rmi/client/jmx/connection/builder.rb

@@ -41,8 +41,7 @@ module Msf
               # Builds an an array of arguments o build a call to
               # javax/management/remote/rmi/RMIConnectionImpl_Stub#getObjectInstance()
               #
-              # @param opts [Hash]
-              # @option opts [String] :name the MBean name
+              # @param name [String] the MBean name
               # @return [Array]
               def build_jmx_get_object_instance_args(name = '')
                 builder = Rex::Java::Serialization::Builder.new
@@ -97,8 +96,7 @@ module Msf
               # Builds an an array of arguments o build a call to
               # javax/management/remote/rmi/RMIConnectionImpl_Stub#createMBean()
               #
-              # @param opts [Hash]
-              # @option opts [String] :name the MBean name
+              # @param name [Hash] the MBean name
               # @return [Array]
               def build_jmx_create_mbean_args(name = '')
                 arguments = [

lib/msf/java/rmi/util.rb

@@ -22,7 +22,6 @@ module Msf
         # Calculates an interface hash to make RMI calls as defined by the JDK 1.1
         #
         # @param methods [Array] set of method names and their descriptors
-        # @param exceptions [Array] set of declared exceptions
         # @return [Fixnum] The interface hash
         # @see http://docs.oracle.com/javase/8/docs/platform/rmi/spec/rmi-stubs24.html The RemoteRef Interface documentation to understand how interface hashes are calculated
         def calculate_interface_hash(methods)