Ticket #56331: kex-rekey-issue.macports.patch

sshconnect2.c

@@ -223 +223 @@
                         orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS];
                         xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS],
                             "%s,null", orig);
-                        free(gss);
                 }
         }
 #endif
@@ -274 +273 @@
         /* remove ext-info from the KEX proposals for rekeying */
         myproposal[PROPOSAL_KEX_ALGS] =
             compat_kex_proposal(options.kex_algorithms);
+#ifdef GSSAPI
+        /* repair myproposal after it was crumpled by the */
+        /* ext-info removal above */
+        if (gss) {
+                orig = myproposal[PROPOSAL_KEX_ALGS];
+                xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
+                          "%s,%s", gss, orig);
+                free(gss);
+        }
+#endif
         if ((r = kex_prop2buf(kex->my, myproposal)) != 0)
                 fatal("kex_prop2buf: %s", ssh_err(r));