diff options
author | Paolo Stivanin | 2015-10-26 10:35:02 +0100 |
---|---|---|
committer | Paolo Stivanin | 2015-10-26 10:35:02 +0100 |
commit | cf8be688fb306f04888a4f42f00324f98310dc8f (patch) | |
tree | bbd1e67246fc752d0044849ca1523be10421c6e1 /gssapi-p0.patch | |
download | aur-cf8be688fb306f04888a4f42f00324f98310dc8f.tar.gz |
first release
Diffstat (limited to 'gssapi-p0.patch')
-rw-r--r-- | gssapi-p0.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/gssapi-p0.patch b/gssapi-p0.patch new file mode 100644 index 000000000000..33236a6d9c7f --- /dev/null +++ b/gssapi-p0.patch @@ -0,0 +1,36 @@ +--- a/sshconnect2.c.orig 2015-10-26 09:44:28.602338321 +0100 ++++ b/sshconnect2.c 2015-10-26 09:43:53.394738805 +0100 +@@ -160,9 +160,33 @@ + struct kex *kex; + int r; + ++#ifdef GSSAPI ++ char *orig = NULL, *gss = NULL; ++ char *gss_host = NULL; ++#endif ++ + xxx_host = host; + xxx_hostaddr = hostaddr; + ++#ifdef GSSAPI ++if (options.gss_keyex) { ++ /* Add the GSSAPI mechanisms currently supported on this ++ * client to the key exchange algorithm proposal */ ++ orig = myproposal[PROPOSAL_KEX_ALGS]; ++ if (options.gss_trust_dns) ++ gss_host = (char *)get_canonical_hostname(1); ++ else ++ gss_host = host; ++ ++ gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity); ++ if (gss) { ++ debug("Offering GSSAPI proposal: %s", gss); ++ xasprintf(&myproposal[PROPOSAL_KEX_ALGS], "%s,%s", gss, orig); ++ } ++} ++#endif ++ ++ + myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal( + options.kex_algorithms); + myproposal[PROPOSAL_ENC_ALGS_CTOS] = |