fixed conflict while merging from heartbleed branch

Author: Sebastiano Di Paola

modules/auxiliary/scanner/ssl/openssl_heartbleed.rb

@@ -101,7 +101,7 @@ def initialize
         'Christian Mehlmauer', # Msf module
         'wvu', # Msf module
         'juan vazquez', # Msf module
-        'Sebastiano Di Paola' #Msf module 
+        'Sebastiano Di Paola' # Msf module
       ],
       'References'     =>
         [
@@ -123,7 +123,7 @@ def initialize
         OptEnum.new('STARTTLS', [true, 'Protocol to use with STARTTLS, None to avoid STARTTLS ', 'None', [ 'None', 'SMTP', 'IMAP', 'JABBER', 'POP3', 'FTP' ]]),
         OptEnum.new('TLSVERSION', [true, 'TLS version to use', '1.0', ['1.0', '1.1', '1.2']]),
         OptBool.new('STOREDUMP', [true, "Store leaked memory in a file", false]),
-        OptRegexp.new('PATTERN_FILTER', [false, "Pattern to filter leaked memory before storing", nil])
+        OptRegexp.new('DUMPFILTER', [false, "Pattern to filter leaked memory before storing", nil])
       ], self.class)
 
     register_advanced_options(
@@ -295,9 +295,9 @@ def run_host(ip)
         :info => "Module #{self.fullname} successfully leaked info"
       })
       if datastore['STOREDUMP']
-        pattern = datastore['PATTERN_FILTER']
-        if !pattern.nil?
-          match_data = heartbeat_data.scan(/#{pattern}/).join('')
+        pattern = datastore['DUMPFILTER']
+        if pattern
+          match_data = heartbeat_data.scan(pattern).join
         else
           match_data = heartbeat_data
         end