Merge 6.5p1.

* New upstream release (http://www.openssh.com/txt/release-6.5,
  LP: #1275068):
  - ssh(1): Add support for client-side hostname canonicalisation using a
    set of DNS suffixes and rules in ssh_config(5).  This allows
    unqualified names to be canonicalised to fully-qualified domain names
    to eliminate ambiguity when looking up keys in known_hosts or checking
    host certificate names (closes: #115286).

1 files changed, 2 insertions, 2 deletions

diff --git a/kexgssc.c b/kexgssc.c
index 616893c7e..14f559883 100644
--- a/kexgssc.c
+++ b/kexgssc.c
@@ -279,7 +279,7 @@ kexgss_client(Kex *kex) {
                 break;
         case KEX_GSS_GEX_SHA1:
                 kexgex_hash(
-                    kex->evp_md,
+                    kex->hash_alg,
                     kex->client_version_string,
                     kex->server_version_string,
                     buffer_ptr(&kex->my), buffer_len(&kex->my),
@@ -325,7 +325,7 @@ kexgss_client(Kex *kex) {
         else
                 ssh_gssapi_delete_ctx(&ctxt);
 
-        kex_derive_keys(kex, hash, hashlen, shared_secret);
+        kex_derive_keys_bn(kex, hash, hashlen, shared_secret);
         BN_clear_free(shared_secret);
         kex_finish(kex);
 }