Skip to content

Commit db676f1

Browse files
egyptegypt
committed
Whitespace at EOL
1 parent c3fa62c commit db676f1

30 files changed

+82
-82
lines changed

‎lib/msf/base/config.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def self.config_directory
8888
def self.module_directory
8989
self.new.module_directory
9090
end
91-
91+
9292
#
9393
# Calls the instance method.
9494
#
@@ -144,7 +144,7 @@ def self.local_directory
144144
def self.user_module_directory
145145
self.new.user_module_directory
146146
end
147-
147+
148148
#
149149
# Calls the instance method.
150150
#
@@ -235,7 +235,7 @@ def history_file
235235
def module_directory
236236
install_root + FileSep + self['ModuleDirectory']
237237
end
238-
238+
239239
#
240240
# Returns the path that scripts can be loaded from.
241241
#
@@ -284,7 +284,7 @@ def local_directory
284284
def user_module_directory
285285
config_directory + FileSep + "modules"
286286
end
287-
287+
288288
#
289289
# Returns the user-specific plugin base path
290290
#

‎lib/msf/base/simple/auxiliary.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def self.run_simple(omod, opts = {}, &block)
7777
Proc.new { |ctx_| self.job_cleanup_proc(ctx_) }
7878
)
7979
# Propagate this back to the caller for console mgmt
80-
omod.job_id = mod.job_id
80+
omod.job_id = mod.job_id
8181
else
8282
self.job_run_proc(ctx)
8383
self.job_cleanup_proc(ctx)

‎lib/msf/base/simple/framework.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def init_module_paths
167167
if (Msf::Config.module_directory)
168168
self.modules.add_module_path(Msf::Config.module_directory)
169169
end
170-
170+
171171
# Initialize the user module search path
172172
if (Msf::Config.user_module_directory)
173173
self.modules.add_module_path(Msf::Config.user_module_directory)

‎lib/msf/core.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module Msf
4141
require 'msf/core/session_manager'
4242

4343

44-
44+
4545
# Wrappers
4646
require 'msf/core/encoded_payload'
4747

‎lib/msf/core/data_store.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ def [](key)
288288
val = super if val.nil?
289289
val
290290
end
291-
291+
292292
#
293293
# Was this entry actually set or just using its default
294294
#

‎lib/msf/core/db_export.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -376,17 +376,17 @@ def extract_module_detail_info(report_file)
376376
d.attributes.each_pair do |k,v|
377377
el = create_xml_element(k,v)
378378
report_file.write(" #{el}\n")
379-
end
379+
end
380380
end
381381
report_file.write(" </module_authors>\n")
382-
382+
383383
# Refs sub-elements
384384
report_file.write(" <module_refs>\n")
385385
m.refs.find(:all).each do |d|
386386
d.attributes.each_pair do |k,v|
387387
el = create_xml_element(k,v)
388388
report_file.write(" #{el}\n")
389-
end
389+
end
390390
end
391391
report_file.write(" </module_refs>\n")
392392

@@ -397,7 +397,7 @@ def extract_module_detail_info(report_file)
397397
d.attributes.each_pair do |k,v|
398398
el = create_xml_element(k,v)
399399
report_file.write(" #{el}\n")
400-
end
400+
end
401401
end
402402
report_file.write(" </module_archs>\n")
403403

@@ -408,7 +408,7 @@ def extract_module_detail_info(report_file)
408408
d.attributes.each_pair do |k,v|
409409
el = create_xml_element(k,v)
410410
report_file.write(" #{el}\n")
411-
end
411+
end
412412
end
413413
report_file.write(" </module_platforms>\n")
414414

@@ -419,7 +419,7 @@ def extract_module_detail_info(report_file)
419419
d.attributes.each_pair do |k,v|
420420
el = create_xml_element(k,v)
421421
report_file.write(" #{el}\n")
422-
end
422+
end
423423
end
424424
report_file.write(" </module_targets>\n")
425425

@@ -429,7 +429,7 @@ def extract_module_detail_info(report_file)
429429
d.attributes.each_pair do |k,v|
430430
el = create_xml_element(k,v)
431431
report_file.write(" #{el}\n")
432-
end
432+
end
433433
end
434434
report_file.write(" </module_actions>\n")
435435

@@ -439,7 +439,7 @@ def extract_module_detail_info(report_file)
439439
d.attributes.each_pair do |k,v|
440440
el = create_xml_element(k,v)
441441
report_file.write(" #{el}\n")
442-
end
442+
end
443443
end
444444
report_file.write(" </module_mixins>\n")
445445

@@ -468,7 +468,7 @@ def extract_host_info(report_file)
468468
el = create_xml_element(k,v)
469469
report_file.write(" #{el}\n")
470470
end
471-
report_file.write(" </host_detail>\n")
471+
report_file.write(" </host_detail>\n")
472472
end
473473
report_file.write(" </host_details>\n")
474474

@@ -479,7 +479,7 @@ def extract_host_info(report_file)
479479
d.attributes.each_pair do |k,v|
480480
el = create_xml_element(k,v)
481481
report_file.write(" #{el}\n")
482-
end
482+
end
483483
report_file.write(" </exploit_attempt>\n")
484484
end
485485
report_file.write(" </exploit_attempts>\n")
@@ -516,7 +516,7 @@ def extract_host_info(report_file)
516516
el = create_xml_element(k,v)
517517
report_file.write(" #{el}\n")
518518
end
519-
519+
520520
# References
521521
report_file.write(" <refs>\n")
522522
e.refs.each do |ref|
@@ -534,7 +534,7 @@ def extract_host_info(report_file)
534534
el = create_xml_element(k,v)
535535
report_file.write(" #{el}\n")
536536
end
537-
report_file.write(" </vuln_detail>\n")
537+
report_file.write(" </vuln_detail>\n")
538538
end
539539
report_file.write(" </vuln_details>\n")
540540

@@ -547,7 +547,7 @@ def extract_host_info(report_file)
547547
el = create_xml_element(k,v)
548548
report_file.write(" #{el}\n")
549549
end
550-
report_file.write(" </vuln_attempt>\n")
550+
report_file.write(" </vuln_attempt>\n")
551551
end
552552
report_file.write(" </vuln_attempts>\n")
553553

‎lib/msf/core/db_manager.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -485,14 +485,14 @@ def module_to_details_hash(m)
485485

486486
m.targets.each_index do |i|
487487
bits << [ :target, { :index => i, :name => m.targets[i].name.to_s } ]
488-
if m.targets[i].platform
488+
if m.targets[i].platform
489489
m.targets[i].platform.platforms.each do |name|
490-
bits << [ :platform, { :name => name.to_s.split('::').last.downcase } ]
491-
end
492-
end
490+
bits << [ :platform, { :name => name.to_s.split('::').last.downcase } ]
491+
end
492+
end
493493
if m.targets[i].arch
494494
bits << [ :arch, { :name => m.targets[i].arch.to_s } ]
495-
end
495+
end
496496
end
497497

498498
if (m.default_target)

‎lib/msf/core/encoded_payload.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def encode
147147
'core', LEV_1)
148148
next
149149
end
150-
150+
151151
# Import the datastore from payload (and likely exploit by proxy)
152152
self.encoder.share_datastore(pinst.datastore)
153153

@@ -276,7 +276,7 @@ def generate_sled
276276
nops.each { |nopname, nopmod|
277277
# Create an instance of the nop module
278278
self.nop = nopmod.new
279-
279+
280280
# Propagate options from the payload and possibly exploit
281281
self.nop.share_datastore(pinst.datastore)
282282

‎lib/msf/core/exploit.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Exploit < Msf::Module
3232

3333

3434
##
35-
# Exceptions
35+
# Exceptions
3636
##
3737

3838
# Indicate that the exploit should abort because it has completed
@@ -1292,7 +1292,7 @@ def reset_session_counts
12921292
##
12931293
# Failure tracking
12941294
##
1295-
1295+
12961296
def fail_with(reason,msg=nil)
12971297
self.fail_reason = reason
12981298
self.fail_detail = msg

‎lib/msf/core/exploit/capture.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ def open_pcap(opts={})
100100
self.capture = ::Pcap.open_offline(cap)
101101
else
102102
dev ||= ::Pcap.lookupdev
103-
103+
104104
unless RUBY_PLATFORM == "i386-mingw32"
105105
system("ifconfig", dev, "up")
106106
end
107-
107+
108108
self.capture = ::Pcap.open_live(dev, len, true, tim)
109109
if arp
110110
self.arp_capture = ::Pcap.open_live(dev, 512, true, tim)

0 commit comments

Comments
 (0)