Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-24 03:09:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source 
Conflicts:
	GhidraDocs/certification.manifest
This commit is contained in:
ghidravore
2019-04-29 14:18:05 -04:00
parent a50c6e0843 a71dc5b94b
commit 91beac819c
4 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPL/nativeBuildProperties.gradle
+7 -9
View File
@@ -18,7 +18,7 @@ apply plugin: 'c'
// Unclear if we can rely on the VisualCpp plugin to identify the correct Visual Studio paths
project.ext.VISUAL_STUDIO_BASE_DIR = "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017"
project.ext.WINDOWS_KITS_DIR = "C:/Program Files (x86)/Windows Kits/10"
project.ext.WINDOWS_KITS_DIR = "C:\\Program Files (x86)\\Windows Kits\\10"
/****************************************************************************
* Method for extracting value from <name>=<value> pairs
@@ -44,11 +44,6 @@ project.ext.VISUAL_STUDIO_VCVARS_CMD = "UNKNOWN"
project.ext.MSVC_SDK_VERSION = "UNKNOWN"
project.ext.MSVC_TOOLS_VERSION = "UNKNOWN"
// Ok, this is stupid, but mac and linux can't handle files paths that start with c:
// These paths are actually only used when running on windows, but the paths gets evaulated
// as a file no matter what platform you run gradle on. So the best solution I can think of is as
// follows.
/*
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
project.ext.VISUAL_STUDIO_INSTALL_DIR = project.ext.VISUAL_STUDIO_BASE_DIR + "\\Professional"
@@ -108,13 +103,16 @@ model {
* Task: verify presence of correct tool chain version for current platform
******************************************************************************************/
task CheckToolChain {
// Native C/Cpp plugins will trigger failure if no tool chain found
doFirst {
if (org.gradle.internal.os.OperatingSystem.current().isWindows()) {
// ensure that required MS Visual Studio is installed where expected
String msg = "Microsoft Visual Studio install not found: ${project.ext.VISUAL_STUDIO_BASE_DIR}\n" +
String msg = "Microsoft Visual Studio install not found: ${VISUAL_STUDIO_BASE_DIR}\n" +
"Adjust path in Ghidra/GPL/nativeBuildProperties.gradle if needed."
assert file(project.ext.VISUAL_STUDIO_BASE_DIR).exists() : msg
assert file(project.ext.VISUAL_STUDIO_INSTALL_DIR).exists() : msg
if (!file(VISUAL_STUDIO_BASE_DIR).exists() ||
!file(VISUAL_STUDIO_INSTALL_DIR).exists()) {
throw new GradleException(msg);
}
}
}
}
Ghidra/Configurations/Public_Release/src/global/docs/ChangeHistory.html
+2 -3
View File
@@ -22,10 +22,11 @@
<blockquote>
<ul>
<li><I>Decompiler.</I> Improved modeling of CFG on Windows 10 (Thanks, Markus Pieton). (Issue #340)</li>
<li><I>Decompiler.</I> Improved modeling of CFG on Windows 10. (Issue #340)</li>
<li><I>Patcher.</I> Renamed patch directory to /Ghidra/patch and added README.txt that explains how the patch directory is used.</li>
<li><I>Search.</I> Fixed NullPointerException in Decompiler Data Type Reference Finder. (Issue #407)</li>
<li><I>Search.</I> Updated the Decompiler Data Type Finder to find references to inside of nested array access in a line of Decompiler C output. (Issue #416)</li>
<li><I>Sleigh.</I> Improved error reporting for SLEIGH compiler. (Issue #364)</li>
</ul>
</blockquote>
@@ -47,8 +48,6 @@
</ul>
</blockquote>
`
<li><I>
<H1 align="center">Ghidra 9.0.2 Change History (April 2019)</H1>
Ghidra/RuntimeScripts/Common/support/launch.properties
+2 -1
View File
@@ -21,7 +21,8 @@ VMARGS=-Duser.variant=
VMARGS=-Dsun.java2d.pmoffscreen=false
VMARGS=-Dsun.java2d.opengl=false
# Resolves issue with Ubuntu when running within VM
# Setting to false resolves issue with Ubuntu when running within VM.
# Setting to true resolves display issues on HiDPI monitors in Linux.
VMARGS=-Dsun.java2d.xrender=false
# Set acceptable HTTPS protocols
GhidraDocs/InstallationGuide.html
+19 -13
View File
@@ -18,7 +18,7 @@
<h1>Ghidra Installation Guide</h1>
<p>
The installation information provided is effective as of Ghidra 9.0.1 and is subject to change with
The installation information provided is effective as of Ghidra 9.0.3 and is subject to change with
future releases.
</p>
@@ -83,7 +83,17 @@ Ghidra team if you have a specific need.</p></blockquote>
<ul>
<li>Java 11 Runtime and Development Kit (JDK) (see <a href="#JavaNotes">Java Notes</a>)</li>
<ul>
<li>OpenJDK distributed from <i>jdk.java.net</i> is suggested</i></li>
<li>Free long term support (LTS) versions of JDK 11 are provided by:</li>
<ul>
<li>
<a href="https://adoptopenjdk.net/releases.html?variant=openjdk11&jvmVariant=hotspot">
AdoptOpenJDK</a>
</li>
<li>
<a href="https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html">
Amazon Corretto</a>
</li>
</ul>
</ul>
</ul>
<p>(<a href="#top">Back to Top</a>)</p>
@@ -128,14 +138,10 @@ destination using any unzip program (built-in OS utilities, 7-Zip, WinZip, WinRA
the parent directory of Java's <i>bin</i> directory). This minimizes the impact Ghidra has on
pre-existing configurations of Java that other software may rely on.
</li>
<li>
Ghidra is developed and tested against OpenJDK distributed from <i>jdk.java.net</i>. Consider
using this OpenJDK distribution for the most stable experience.
</li>
<li>
If Ghidra failed to run because <i>no versions</i> of Java were on the PATH, a
<a href="#Requirements">supported</a> JDK should be manually installed and added to the
PATH. The following steps outline how to add an OpenJDK distribution to the operating system's
PATH. The following steps outline how to add a JDK distribution to the operating system's
PATH.
<ul>
<li>
@@ -545,13 +551,13 @@ be installed in a pre-existing Eclipse installation.</p>
<h3><a name="LinuxIssues"></a>Linux</h3>
<ul>
<li>
Some users have reported Ghidra GUI rendering issues on 4k displays and multi-monitor thin
client setups. These problems are attributed to reported bugs in Java. Upgrading to a newer
version of Java may fix the issue.
</li>
Ghidra may not display correctly on Linux systems with HiDPI monitors. Setting
<i>VMARGS=-Dsun.java2d.xrender=false</i> to <i><b>true</b></i> in
<i>&lt;GhidraInstallDir&gt;</i>/support/launch.properties has been known to improve this issue.
<li>
At the time of writing, installing the openjdk-11 package in Ubuntu 18.04 results in openjdk-10
being installed which is incompatible with Ghidra.
Some users have reported Ghidra GUI rendering issues on multi-monitor thin client setups.
These problems are attributed to reported bugs in Java, which will hopefully be fixed in the
future. Disabling the 2nd or 3rd monitor may be necessary to work around the issue.
</li>
</ul>
<h3><a name="MacOSIssues"></a>macOS (OS X)</h3>