mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-04-20 05:41:12 +02:00
metasploit: possible fix for reported cpuinfo issues
This commit is contained in:
Zero_Chaos
parent
b01b02c325
commit
47e43a9e3a
3 changed files with 94 additions and 3 deletions
|
|
@ -1,5 +1,6 @@
|
|||
AUX bug-8456.patch 3426 SHA256 aed0fe7171e1e65a7f80c8bb23461acf1fb5b30750370fc7756f1997656b3726 SHA512 6c56e1f269b07945fe5b3c8fc90530fa455bb8319459aae39de06e881da9c192afbeb7ee8ecb27a0ea95d82f1be7c04ddbc1dbd4bb61a7d0eddd860edf8a6aa2 WHIRLPOOL c6c2a635d2b11f8127b668b3d0b1e2b6ba78ec2f46f5665eb0131ca0af35fb8fec09379adc46536c91803fc104e2ea7d56ce7fa780adf9d2c509ecae39f74712
|
||||
AUX database.yml 675 SHA256 397c6e42af99f0691c3380fd65ce8625389e104d75eff806a43ba296537067ea SHA512 a56d474e1b562c3eaaca009d722fa6f6496745608c4fffeed9aae42408625edb01ae13a488d3bdeef5e51131852ec505f35d25f8c21a091f70690c853850cfe1 WHIRLPOOL 103420f9dfd43e1427d2a7d1e3e47e4d3a9a36e220ed45cba5c91106aa15007fdb653911a238216d90fd3dea042cbe8494fd5d57b21bcd177a5a7c284be11a0d
|
||||
AUX metasploit.icon 7630 SHA256 d197dd3b939c35d951c2cd5c19b51200ada7f8f92d90775a9eaebdccf18e3949 SHA512 569db261a3782f3874c30ccaf076be512437a9a5a9df835baf29bacec48dd76b2896e009b5ab165ba82aff72ab15d067155f257787e69c3a7cd034dafa5a9066 WHIRLPOOL 3f66eb2a3b51dc787f5da6b2fd93165fdca3e9ae391db0ea69cb0ea5c6c1d9f2d85fffbdb117da4065e0b3e29daa5b7d7e62740cd3210768aa0cfc4a63679376
|
||||
DIST framework-4.6.0.tar.bz2 49996884 SHA256 ec6dfe58cb5a897e8c8e56d919dec7c00d56fe758efd1350c2a7a3587ef538c2 SHA512 ff73ebd5e08f96d7ffb63ad59cd4fa608705a1a72f00b82ce074fc537e7037349fedf71f768a895ec4e36aabb4ae07fd6b6a0f12ff88807b8ca9202f0d770633 WHIRLPOOL 952407ce34e0d94f7a824c6a3b963c6321da9aee0626295389b1f4f7d4671b9577e5bfab8f581144696f6c4a1bb073f7b7056d8c54853dbf60a6dcb7c320b336
|
||||
EBUILD metasploit-4.6.0.ebuild 6293 SHA256 6343754b28505ccec773e20c9a2385890803859d5d38c51f601448d50f39048f SHA512 45cc5cd171bae5f559035bede6bebb7bb81ace641886317c6bf540f34c2c4a645c677c00b72e47daeaa06e195d358d8ad1a95f9c9307ae2f4e65df5fddc7b168 WHIRLPOOL 36fc119489d82c116b822b7742b575f8361f3bb041d8041f309cd4e171502054d0153cd07ef75fc26b9e87fb9104adaa0ed9ce59086d47e34a58d491cdef3885
|
||||
EBUILD metasploit-9999.ebuild 9344 SHA256 192c60039cc5f4917600a63a8aba0cbced8e4adb2a495d761dce862379c971e3 SHA512 d439ab5c8cbd7ca9105fdc8ce15835b9fe5d48478c2c6c382fefe162623d13dcc7b5c7c2d6efe41b57b95ca4e57c9912b06f79b0bd5f2d465c3ea22c0c02b387 WHIRLPOOL 4b06a196159ce17d5dbe5106a9c4ffb19e133c9913113a6545ea6d8cdab850872ef67743c41ec186e556dd52b96611c902a2ae0c3361429115ece520c0bb5a31
|
||||
EBUILD metasploit-9999.ebuild 9245 SHA256 f94a6591cbcec09ab5d839a3c9e720443b4e19bf37fc95a2852581e8ff9af8ca SHA512 d6332a64b7cbc4ed01143c3831288449bf7f224744775f572e96a85f7e568164c90ce97dc88f94d8cc58c88414113cc9162348d50331a6b5aa2a8cae38d81658 WHIRLPOOL 13622efc8d384cf63e7a0532461108f52d482caa3c23d72241f911ecade41c43f40f067e07ef74adf79843fefc09492d4f38238077d91b1e92272b6d879d827c
|
||||
|
|
|
|||
91
net-analyzer/metasploit/files/bug-8456.patch
Normal file
91
net-analyzer/metasploit/files/bug-8456.patch
Normal file
|
|
@ -0,0 +1,91 @@
|
|||
From 5f4e4de267b37ddb159918212c5169cb034874df Mon Sep 17 00:00:00 2001
|
||||
From: ZeroChaos <sidhayn@gmail.com>
|
||||
Date: Fri, 4 Oct 2013 15:58:47 -0400
|
||||
Subject: [PATCH] fix for bug 8456
|
||||
|
||||
On systems without bundled johntheripper (either by removing the bundled version or by no compatible version shipped) the system john is used. In this case, all of the checking for compatible bundled jtr makes no sense and as such we can shortcut out of this to not only reduce the size of msf (for embedded) but also to speed execution (saving multiple calls to some random bundled binary cpuinfo*.bin).
|
||||
|
||||
This patch makes it very easy to simply remove cpuinfo and msf will not try to run it when missing and default to running john from the path.
|
||||
---
|
||||
lib/msf/core/auxiliary/jtr.rb | 64 ++++++++++++++++++++++---------------------
|
||||
1 file changed, 33 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/lib/msf/core/auxiliary/jtr.rb b/lib/msf/core/auxiliary/jtr.rb
|
||||
index 6b9ddb3..6a9c598 100644
|
||||
--- a/lib/msf/core/auxiliary/jtr.rb
|
||||
+++ b/lib/msf/core/auxiliary/jtr.rb
|
||||
@@ -41,38 +41,40 @@ def autodetect_platform
|
||||
cpuinfo_base = ::File.join(Msf::Config.install_root, "data", "cpuinfo")
|
||||
return @run_path if @run_path
|
||||
|
||||
- case ::RUBY_PLATFORM
|
||||
- when /mingw|cygwin|mswin/
|
||||
- data = `"#{cpuinfo_base}/cpuinfo.exe"` rescue nil
|
||||
- case data
|
||||
- when /sse2/
|
||||
- @run_path ||= "run.win32.sse2/john.exe"
|
||||
- when /mmx/
|
||||
- @run_path ||= "run.win32.mmx/john.exe"
|
||||
- else
|
||||
- @run_path ||= "run.win32.any/john.exe"
|
||||
- end
|
||||
-
|
||||
- when /x86_64-linux/
|
||||
- ::FileUtils.chmod(0755, "#{cpuinfo_base}/cpuinfo.ia64.bin") rescue nil
|
||||
- data = `#{cpuinfo_base}/cpuinfo.ia64.bin` rescue nil
|
||||
- case data
|
||||
- when /mmx/
|
||||
- @run_path ||= "run.linux.x64.mmx/john"
|
||||
- else
|
||||
- @run_path ||= "run.linux.x86.any/john"
|
||||
- end
|
||||
+ if File.directory?(cpuinfo_base)
|
||||
+ case ::RUBY_PLATFORM
|
||||
+ when /mingw|cygwin|mswin/
|
||||
+ data = `"#{cpuinfo_base}/cpuinfo.exe"` rescue nil
|
||||
+ case data
|
||||
+ when /sse2/
|
||||
+ @run_path ||= "run.win32.sse2/john.exe"
|
||||
+ when /mmx/
|
||||
+ @run_path ||= "run.win32.mmx/john.exe"
|
||||
+ else
|
||||
+ @run_path ||= "run.win32.any/john.exe"
|
||||
+ end
|
||||
|
||||
- when /i[\d]86-linux/
|
||||
- ::FileUtils.chmod(0755, "#{cpuinfo_base}/cpuinfo.ia32.bin") rescue nil
|
||||
- data = `#{cpuinfo_base}/cpuinfo.ia32.bin` rescue nil
|
||||
- case data
|
||||
- when /sse2/
|
||||
- @run_path ||= "run.linux.x86.sse2/john"
|
||||
- when /mmx/
|
||||
- @run_path ||= "run.linux.x86.mmx/john"
|
||||
- else
|
||||
- @run_path ||= "run.linux.x86.any/john"
|
||||
+ when /x86_64-linux/
|
||||
+ ::FileUtils.chmod(0755, "#{cpuinfo_base}/cpuinfo.ia64.bin") rescue nil
|
||||
+ data = `#{cpuinfo_base}/cpuinfo.ia64.bin` rescue nil
|
||||
+ case data
|
||||
+ when /mmx/
|
||||
+ @run_path ||= "run.linux.x64.mmx/john"
|
||||
+ else
|
||||
+ @run_path ||= "run.linux.x86.any/john"
|
||||
+ end
|
||||
+
|
||||
+ when /i[\d]86-linux/
|
||||
+ ::FileUtils.chmod(0755, "#{cpuinfo_base}/cpuinfo.ia32.bin") rescue nil
|
||||
+ data = `#{cpuinfo_base}/cpuinfo.ia32.bin` rescue nil
|
||||
+ case data
|
||||
+ when /sse2/
|
||||
+ @run_path ||= "run.linux.x86.sse2/john"
|
||||
+ when /mmx/
|
||||
+ @run_path ||= "run.linux.x86.mmx/john"
|
||||
+ else
|
||||
+ @run_path ||= "run.linux.x86.any/john"
|
||||
+ end
|
||||
end
|
||||
end
|
||||
@run_path
|
||||
--
|
||||
1.8.4
|
||||
|
||||
|
|
@ -110,9 +110,8 @@ src_prepare() {
|
|||
rm -rf "${S}"/data/john/src.tar.bz2
|
||||
#remove random "cpuinfo" binaries which a only needed to detect which bundled john to run
|
||||
rm -rf "${S}"/data/cpuinfo/*
|
||||
#seems the ia64 runs unconditionally for some god forsaken reason, this shuts up the error
|
||||
#http://dev.metasploit.com/redmine/issues/8456
|
||||
touch "${S}"/data/cpuinfo/cpuinfo.ia64.bin
|
||||
epatch "${FILESDIR}"/bug-8456.patch
|
||||
|
||||
#remove random included sources
|
||||
rm -rf "${S}"/external/source
|
||||
|
|
|
|||
Loading…
Reference in a new issue