From 032eb61aff67b95e46f5221d07fcd5d821566cac Mon Sep 17 00:00:00 2001
From: d-millar <33498836+d-millar@users.noreply.github.com>
Date: Fri, 14 Jan 2022 10:09:03 -0500
Subject: [PATCH] GP-1655: better fix GP-1655: fix for SSH exception on cancel

---
 .../main/java/agent/gdb/pty/ssh/GhidraSshPtyFactory.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/pty/ssh/GhidraSshPtyFactory.java b/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/pty/ssh/GhidraSshPtyFactory.java
index 68fdb1954e..21688cabfe 100644
--- a/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/pty/ssh/GhidraSshPtyFactory.java
+++ b/Ghidra/Debug/Debugger-agent-gdb/src/main/java/agent/gdb/pty/ssh/GhidraSshPtyFactory.java
@@ -17,6 +17,7 @@ package agent.gdb.pty.ssh;
 
 import java.io.IOException;
 import java.util.Objects;
+import java.util.concurrent.CancellationException;
 
 import javax.swing.JOptionPane;
 
@@ -28,7 +29,8 @@ import com.jcraft.jsch.ConfigRepository.Config;
 import agent.gdb.pty.PtyFactory;
 import docking.DockingWindowManager;
 import docking.widgets.PasswordDialog;
-import ghidra.util.*;
+import ghidra.util.Msg;
+import ghidra.util.StringUtilities;
 
 public class GhidraSshPtyFactory implements PtyFactory {
 	private static final String TITLE = "GDB via SSH";
@@ -209,6 +211,10 @@ public class GhidraSshPtyFactory implements PtyFactory {
 			return session;
 		}
 		catch (JSchException e) {
+			if (e.getMessage().equals("Auth cancel")) {
+				Msg.error(this, "SSH connection canceled");
+				throw new CancellationException("SSH connection canceled");
+			}
 			Msg.error(this, "SSH connection error");
 			throw new IOException("SSH connection error", e);
 		}