diff -Naurp questing.ori/openssh-10.0p1/kexgssc.c questing/openssh-10.0p1/kexgssc.c
--- questing.ori/openssh-10.0p1/kexgssc.c	2026-02-27 11:52:10.000000000 -0500
+++ questing/openssh-10.0p1/kexgssc.c	2026-02-27 09:50:51.928367884 -0500
@@ -52,8 +52,8 @@ kexgss_client(struct ssh *ssh)
 {
 	struct kex *kex = ssh->kex;
 	gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER,
-	    recv_tok = GSS_C_EMPTY_BUFFER,
-	    gssbuf, msg_tok = GSS_C_EMPTY_BUFFER, *token_ptr;
+	    recv_tok = GSS_C_EMPTY_BUFFER, gssbuf = GSS_C_EMPTY_BUFFER,
+	    msg_tok = GSS_C_EMPTY_BUFFER, *token_ptr;
 	Gssctxt *ctxt;
 	OM_uint32 maj_status, min_status, ret_flags;
 	struct sshbuf *server_blob = NULL;
@@ -198,11 +198,11 @@ kexgss_client(struct ssh *ssh)
 						fatal("Failed to read token: %s", ssh_err(r));
 					/* If we're already complete - protocol error */
 					if (maj_status == GSS_S_COMPLETE)
-						sshpkt_disconnect(ssh, "Protocol error: received token when complete");
+						ssh_packet_disconnect(ssh, "Protocol error: received token when complete");
 				} else {
 					/* No token included */
 					if (maj_status != GSS_S_COMPLETE)
-						sshpkt_disconnect(ssh, "Protocol error: did not receive final token");
+						ssh_packet_disconnect(ssh, "Protocol error: did not receive final token");
 				}
 				if ((r = sshpkt_get_end(ssh)) != 0) {
 					fatal("Expecting end of packet.");
@@ -218,7 +218,7 @@ kexgss_client(struct ssh *ssh)
 					fatal("sshpkt_get failed: %s", ssh_err(r));
 				fatal("GSSAPI Error: \n%.400s", msg);
 			default:
-				sshpkt_disconnect(ssh, "Protocol error: didn't expect packet type %d",
+				ssh_packet_disconnect(ssh, "Protocol error: didn't expect packet type %d",
 				    type);
 			}
 			token_ptr = &recv_tok;
@@ -291,7 +291,7 @@ kexgss_client(struct ssh *ssh)
 
 	/* Verify that the hash matches the MIC we just got. */
 	if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
-		sshpkt_disconnect(ssh, "Hash's MIC didn't verify");
+		ssh_packet_disconnect(ssh, "Hash's MIC didn't verify");
 
 	gss_release_buffer(&min_status, &msg_tok);
 
@@ -323,8 +323,8 @@ kexgssgex_client(struct ssh *ssh)
 {
 	struct kex *kex = ssh->kex;
 	gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER,
-	    recv_tok = GSS_C_EMPTY_BUFFER, gssbuf,
-            msg_tok = GSS_C_EMPTY_BUFFER, *token_ptr;
+	    recv_tok = GSS_C_EMPTY_BUFFER, gssbuf = GSS_C_EMPTY_BUFFER,
+	    msg_tok = GSS_C_EMPTY_BUFFER, *token_ptr;
 	Gssctxt *ctxt;
 	OM_uint32 maj_status, min_status, ret_flags;
 	struct sshbuf *shared_secret = NULL;
@@ -493,11 +493,11 @@ kexgssgex_client(struct ssh *ssh)
 						fatal("sshpkt failed: %s", ssh_err(r));
 					/* If we're already complete - protocol error */
 					if (maj_status == GSS_S_COMPLETE)
-						sshpkt_disconnect(ssh, "Protocol error: received token when complete");
+						ssh_packet_disconnect(ssh, "Protocol error: received token when complete");
 				} else {
 					/* No token included */
 					if (maj_status != GSS_S_COMPLETE)
-						sshpkt_disconnect(ssh, "Protocol error: did not receive final token");
+						ssh_packet_disconnect(ssh, "Protocol error: did not receive final token");
 				}
 				break;
 			case SSH2_MSG_KEXGSS_ERROR:
@@ -510,7 +510,7 @@ kexgssgex_client(struct ssh *ssh)
 					fatal("sshpkt failed: %s", ssh_err(r));
 				fatal("GSSAPI Error: \n%.400s", msg);
 			default:
-				sshpkt_disconnect(ssh, "Protocol error: didn't expect packet type %d",
+				ssh_packet_disconnect(ssh, "Protocol error: didn't expect packet type %d",
 				    type);
 			}
 			token_ptr = &recv_tok;
@@ -572,7 +572,7 @@ kexgssgex_client(struct ssh *ssh)
 
 	/* Verify that the hash matches the MIC we just got. */
 	if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
-		sshpkt_disconnect(ssh, "Hash's MIC didn't verify");
+		ssh_packet_disconnect(ssh, "Hash's MIC didn't verify");
 
 	gss_release_buffer(&min_status, &msg_tok);
 
diff -Naurp questing.ori/openssh-10.0p1/kexgsss.c questing/openssh-10.0p1/kexgsss.c
--- questing.ori/openssh-10.0p1/kexgsss.c	2026-02-27 11:52:10.000000000 -0500
+++ questing/openssh-10.0p1/kexgsss.c	2026-02-27 09:50:51.928517291 -0500
@@ -64,7 +64,8 @@ kexgss_server(struct ssh *ssh)
 	 */
 
 	OM_uint32 ret_flags = 0;
-	gss_buffer_desc gssbuf, recv_tok, msg_tok;
+	gss_buffer_desc gssbuf = GSS_C_EMPTY_BUFFER,
+	    recv_tok = GSS_C_EMPTY_BUFFER, msg_tok = GSS_C_EMPTY_BUFFER;
 	gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
 	Gssctxt *ctxt = NULL;
 	struct sshbuf *shared_secret = NULL;
@@ -143,7 +144,7 @@ kexgss_server(struct ssh *ssh)
 				fatal("sshpkt failed: %s", ssh_err(r));
 			break;
 		default:
-			sshpkt_disconnect(ssh,
+			ssh_packet_disconnect(ssh,
 			    "Protocol error: didn't expect packet type %d",
 			    type);
 		}
@@ -259,7 +260,8 @@ kexgssgex_server(struct ssh *ssh)
 	 */
 
 	OM_uint32 ret_flags = 0;
-	gss_buffer_desc gssbuf, recv_tok, msg_tok;
+	gss_buffer_desc gssbuf = GSS_C_EMPTY_BUFFER,
+	    recv_tok = GSS_C_EMPTY_BUFFER, msg_tok = GSS_C_EMPTY_BUFFER;
 	gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
 	Gssctxt *ctxt = NULL;
 	struct sshbuf *shared_secret = NULL;
@@ -320,8 +322,7 @@ kexgssgex_server(struct ssh *ssh)
 		    min, nbits, max);
 	kex->dh = mm_choose_dh(min, nbits, max);
 	if (kex->dh == NULL) {
-		sshpkt_disconnect(ssh, "Protocol error: no matching group found");
-		fatal("Protocol error: no matching group found");
+		ssh_packet_disconnect(ssh, "Protocol error: no matching group found");
 	}
 
 	DH_get0_pqg(kex->dh, &dh_p, NULL, &dh_g);
@@ -360,7 +361,7 @@ kexgssgex_server(struct ssh *ssh)
 				fatal("sshpkt failed: %s", ssh_err(r));
 			break;
 		default:
-			sshpkt_disconnect(ssh,
+			ssh_packet_disconnect(ssh,
 			    "Protocol error: didn't expect packet type %d",
 			    type);
 		}