mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-10-22 18:22:23 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1710_Dan_errorPopupOnDeclineSshHostKey'

Browse Source
This commit is contained in:
Ryan Kurtz
2023-04-24 06:50:28 -04:00
parent 66d494c603 9810102e72
commit 5929794468
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/pty/ssh/GhidraSshPtyFactory.java
View File

@@ -211,10 +211,16 @@ public class GhidraSshPtyFactory implements PtyFactory {
return session;
}
catch (JSchException e) {
if (e.getMessage().equals("Auth cancel")) {
String message = e.getMessage();
if (message.equals("Auth cancel")) {
Msg.error(this, "SSH connection canceled");
throw new CancellationException("SSH connection canceled");
}
else if (message.startsWith("reject HostKey")) {
String cancelMessage = "SSH " + message;
Msg.error(this, cancelMessage);
throw new CancellationException(cancelMessage);
}
Msg.error(this, "SSH connection error");
throw new IOException("SSH connection error", e);
}

2
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/copying/DebuggerCopyIntoProgramDialog.java
View File

@@ -810,7 +810,7 @@ public class DebuggerCopyIntoProgramDialog extends ReusableDialogComponentProvid
protected void executeCapture(AddressRange range, TraceRecorder recorder, TaskMonitor monitor)
throws Exception {
synchronized (this) {
monitor.checkCanceled();
monitor.checkCancelled();
CompletableFuture<Void> recCapture =
recorder.readMemoryBlocks(new AddressSet(range), monitor);
this.captureTask = recCapture.thenCompose(__ -> {