Attachment 1480064 Details for Bug 1624344 – Fixes rekey proposal

Fixes rekey proposal

kex-rekey-issue.patch (text/plain), 1.05 KB, created by Daniel Ahlin on 2018-08-31 09:26:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Ahlin

Created: 2018-08-31 09:26:10 UTC

Size: 1.05 KB

patch

obsolete

>
>
>--- sshconnect2.c.orig  2017-01-04 19:47:10.000000000 +0100
>+++ sshconnect2.c       2017-01-05 04:13:08.977425272 +0100
>@@ -222,7 +222,6 @@
>                        orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS];
>                        xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS],
>                            "%s,null", orig);
>-                       free(gss);
>                }
>        }
> #endif
>@@ -273,6 +272,16 @@
>        /* 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));
>
>

Actions: View

Attachments on bug 1624344: 1480064