Samuel Huckins 149c3ecc63 Various merge resolutions from master <- staging ...

* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing

2014-08-15 11:33:31 -05:00

..

exe

better validation of buffer register

2013-09-09 12:16:15 -05:00

exploit

Merge remote-tracking branch 'upstream/master' into pr2075

2014-07-16 20:34:34 +01:00

handler/reverse_http

move rev_http uri checksum code

2014-01-13 15:18:16 -06:00

modules

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

options

Retab all the things (except external/)

2013-09-30 13:47:53 -05:00

post/windows

Add spec for capture_lsa_key

2013-11-13 15:16:34 -06:00

data_store_spec.rb

Retab all the things (except external/)

2013-09-30 13:47:53 -05:00

framework_spec.rb

Various merge resolutions from master <- staging

2014-08-15 11:33:31 -05:00

module_manager_spec.rb

Retab all the things (except external/)

2013-09-30 13:47:53 -05:00

module_spec.rb

Remove inapplicable comment.

2013-07-18 13:42:55 -05:00

option_container_spec.rb

Replace mock with double in specs

2013-09-06 09:34:05 -05:00

payload_generator_spec.rb

fix specs from change

2014-03-18 13:52:17 -05:00

task_manager_spec.rb

Increase duration timeout task manager

2013-11-25 10:26:51 -06:00