34f29f218c
really resolve merge conflicts
2014-10-23 21:51:33 -05:00
4ff211ec8d
Fix the spec to allow for 1 or more spaces between
2014-06-30 13:18:43 -05:00
ccf967fdfe
added support to msfpayload to use elf so payload target
2014-06-19 00:59:49 -05:00
f35314b9f0
adjust Msf::Util::EXE for newer file output
...
Newer releases of File have a much different output when given a jar
file. Adjust regex per egyp7's suggestion to close bug 8792 on redmine.
Failure/Error: verify_bin_fingerprint(format_hash, bin)
expected: /zip/i
got: "/dev/stdin: Java archive data (JAR)\n" (using =~)
Tested and confirmed working with file 5.17 on Gentoo Linux.
2014-04-22 02:21:09 -05:00
cce354762d
Altered case by request
2013-12-31 16:09:11 -08:00
fc792bdaae
Fix for Rspec failure in Msf::Util::EXE
...
[FixRM #8723 ]
2013-12-21 02:49:44 -07:00
8ab7964aa7
improve regex
2013-11-11 15:29:34 -06:00
9b3211af6b
Add regex patterns for OSX files
2013-11-11 15:20:00 -06:00
8a9843cca6
Merge upstream/master
2013-09-27 20:02:23 +01:00
695fdf836c
Generate NonUAC MSIs
2013-09-21 13:13:18 +01:00
11bdf5d332
New pull
2013-09-19 19:57:38 +01:00
53c3f6b2db
Deconflict
2013-08-30 10:52:42 +01:00
eba6762977
Land #2270 , Util::EXE refactor
...
With a minor rebase to fix a commit message
[Closes #2270 ]
Conflicts:
spec/support/shared/contexts/msf/util/exe.rb
2013-08-28 21:49:59 -05:00
fbbfb0a26d
Merge and rescue ex correctly
2013-08-28 21:39:56 -05:00
239fd4840e
Update spec
2013-08-25 19:21:05 +01:00
9ea17ef1e1
Merge upstream
2013-08-24 03:34:02 +01:00
ffc575dcc2
Whitespace in spec
2013-08-24 00:47:16 +01:00
9e2d9da017
Make spec exercise non-exes
2013-08-24 00:33:06 +01:00
55147d9bde
Fix regex to work on OSX's file(1)
2013-08-06 14:00:35 -05:00
00c7581099
Fix constant names and 'exe-only'
...
That'll teach me to commit before the specs finish.
Really [FixRM #8149 ]
2013-07-06 12:39:15 -05:00
1b504197be
Check equality instead of regex
...
Thanks, @Meatballs1 for finding the cause of this bug!
[FixRM #8149 ]
2013-07-06 12:29:37 -05:00
60a7ad551e
Derp, missed file
2013-07-05 17:02:45 -05:00
Joshua Smith
HD Moore
navs
Rick Farina (Zero_Chaos)
Timothy Swartz
sinn3r
Meatballs
James Lee