Ghidra is a software reverse engineering (SRE) framework
Merge remote-tracking branch 'origin/patch'
Ryan Kurtze4e2e4369e68
diff --cc Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.ps1index ba4fbd1fbe,52c1f30c42..7da578cd36--- a/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.ps1+++ b/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdb.ps1@@@ -1,3 -1,19 +1,18 @@@+ ## ###+ # IP: GHIDRA+ #+ # Licensed under the Apache License, Version 2.0 (the "License");+ # you may not use this file except in compliance with the License.+ # You may obtain a copy of the License at+ #+ # http://www.apache.org/licenses/LICENSE-2.0+ #+ # Unless required by applicable law or agreed to in writing, software+ # distributed under the License is distributed on an "AS IS" BASIS,+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ # See the License for the specific language governing permissions and+ # limitations under the License.+ ##-#@timeout 60000#@title gdb via ssh#@image-opt arg:1#@desc <html><body width="300px">diff --cc Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdbserver.ps1index 41b7c0dcff,1e7b598f60..d1b866bbc2--- a/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdbserver.ps1+++ b/Ghidra/Debug/Debugger-agent-gdb/data/debugger-launchers/ssh-gdbserver.ps1@@@ -1,3 -1,19 +1,18 @@@+ ## ###+ # IP: GHIDRA+ #+ # Licensed under the Apache License, Version 2.0 (the "License");+ # you may not use this file except in compliance with the License.+ # You may obtain a copy of the License at+ #+ # http://www.apache.org/licenses/LICENSE-2.0+ #+ # Unless required by applicable law or agreed to in writing, software+ # distributed under the License is distributed on an "AS IS" BASIS,+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ # See the License for the specific language governing permissions and+ # limitations under the License.+ ##-#@timeout 60000#@title gdb + gdbserver via ssh#@image-opt arg:1#@desc <html><body width="300px">diff --cc Ghidra/Debug/Debugger-agent-gdb/data/support/gdbsetuputils.ps1index 254920af23,e39e313e87..bfcdcda03e--- a/Ghidra/Debug/Debugger-agent-gdb/data/support/gdbsetuputils.ps1+++ b/Ghidra/Debug/Debugger-agent-gdb/data/support/gdbsetuputils.ps1@@@ -1,5 -1,19 +1,19 @@@-+ ## ###+ # IP: GHIDRA+ #+ # Licensed under the Apache License, Version 2.0 (the "License");+ # you may not use this file except in compliance with the License.+ # You may obtain a copy of the License at+ #+ # http://www.apache.org/licenses/LICENSE-2.0+ #+ # Unless required by applicable law or agreed to in writing, software+ # distributed under the License is distributed on an "AS IS" BASIS,+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ # See the License for the specific language governing permissions and+ # limitations under the License.+ ##-. ..\..\..\Debugger-rmi-trace\data\support\setuputils.ps1+. $Env:MODULE_Debugger_rmi_trace_HOME\data\support\setuputils.ps1function Add-Gdb-Init-Args {param([ref]$ArgList)diff --cc Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.ps1index bc8854d173,194ad80e2a..3b9c31f799--- a/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.ps1+++ b/Ghidra/Debug/Debugger-agent-lldb/data/debugger-launchers/ssh-lldb.ps1@@@ -1,3 -1,19 +1,18 @@@+ ## ###+ # IP: GHIDRA+ #+ # Licensed under the Apache License, Version 2.0 (the "License");+ # you may not use this file except in compliance with the License.+ # You may obtain a copy of the License at+ #+ # http://www.apache.org/licenses/LICENSE-2.0+ #+ # Unless required by applicable law or agreed to in writing, software+ # distributed under the License is distributed on an "AS IS" BASIS,+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ # See the License for the specific language governing permissions and+ # limitations under the License.+ ##-#@timeout 60000#@title lldb via ssh#@image-opt arg:1#@desc <html><body width="300px">diff --cc Ghidra/Debug/Debugger-agent-lldb/data/support/lldbsetuputils.ps1index 387af9d972,3af4bfbaee..75d05c17e1--- a/Ghidra/Debug/Debugger-agent-lldb/data/support/lldbsetuputils.ps1+++ b/Ghidra/Debug/Debugger-agent-lldb/data/support/lldbsetuputils.ps1@@@ -1,5 -1,19 +1,19 @@@-+ ## ###+ # IP: GHIDRA+ #+ # Licensed under the Apache License, Version 2.0 (the "License");+ # you may not use this file except in compliance with the License.+ # You may obtain a copy of the License at+ #+ # http://www.apache.org/licenses/LICENSE-2.0+ #+ # Unless required by applicable law or agreed to in writing, software+ # distributed under the License is distributed on an "AS IS" BASIS,+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ # See the License for the specific language governing permissions and+ # limitations under the License.+ ##-. ..\..\..\Debugger-rmi-trace\data\support\setuputils.ps1+. $Env:MODULE_Debugger_rmi_trace_HOME\data\support\setuputils.ps1function Add-Lldb-Init-Args {param([ref]$ArgList)diff --cc Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.ps1index 54dfc552fc,e8dfad0ab6..f2454b9db0--- a/Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.ps1+++ b/Ghidra/Debug/Debugger-rmi-trace/data/support/setuputils.ps1@@@ -1,7 -1,26 +1,22 @@@+ ## ###+ # IP: GHIDRA+ #+ # Licensed under the Apache License, Version 2.0 (the "License");+ # you may not use this file except in compliance with the License.+ # You may obtain a copy of the License at+ #+ # http://www.apache.org/licenses/LICENSE-2.0+ #+ # Unless required by applicable law or agreed to in writing, software+ # distributed under the License is distributed on an "AS IS" BASIS,+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ # See the License for the specific language governing permissions and+ # limitations under the License.+ ##function Find-App-Properties {- [IO.FileInfo] $simple = "$Env:GHIDRA_HOME\Ghidra\applications.properties"- if ($simple.Exists) {- return $simple- }- [IO.FileInfo] $dev2 = "$Env:GHIDRA_HOME\ghidra\Ghidra\application.properties"- if ($dev2.Exists) {- return $dev2+ [IO.FileInfo] $props = "$Env:GHIDRA_HOME\application.properties"+ if ($props.Exists) {+ return $props}throw "Cannot find application.properties"}