From d94cf274564baf22b5fa2928bc2a0a8c8e69946c Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Mar 26 2015 13:20:31 +0000
Subject: Fix buffer handling in GSS after rebase


---

diff --git a/openssh-6.6p1-gsskex.patch b/openssh-6.6p1-gsskex.patch
index 42b6a10..1f8ed83 100644
--- a/openssh-6.6p1-gsskex.patch
+++ b/openssh-6.6p1-gsskex.patch
@@ -1346,8 +1346,8 @@ diff -up openssh-6.8p1/kexgssc.c.gsskex openssh-6.8p1/kexgssc.c
 +	case KEX_GSS_GRP14_SHA1:
 +		kex_dh_hash( ssh->kex->client_version_string, 
 +		    ssh->kex->server_version_string,
-+		    buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
-+		    buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
++		    buffer_ptr(&ssh->kex->my), buffer_len(&ssh->kex->my),
++		    buffer_ptr(&ssh->kex->peer), buffer_len(&ssh->kex->peer),
 +		    (serverhostkey ? serverhostkey : empty), slen,
 +		    dh->pub_key,	/* e */
 +		    dh_server_pub,	/* f */
@@ -1360,8 +1360,8 @@ diff -up openssh-6.8p1/kexgssc.c.gsskex openssh-6.8p1/kexgssc.c
 +		    ssh->kex->hash_alg,
 +		    ssh->kex->client_version_string,
 +		    ssh->kex->server_version_string,
-+		    buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
-+		    buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
++		    buffer_ptr(&ssh->kex->my), buffer_len(&ssh->kex->my),
++		    buffer_ptr(&ssh->kex->peer), buffer_len(&ssh->kex->peer),
 +		    (serverhostkey ? serverhostkey : empty), slen,
 + 		    min, nbits, max,
 +		    dh->p, dh->g,
@@ -1636,8 +1636,8 @@ diff -up openssh-6.8p1/kexgsss.c.gsskex openssh-6.8p1/kexgsss.c
 +	case KEX_GSS_GRP14_SHA1:
 +		kex_dh_hash(
 +		    ssh->kex->client_version_string, ssh->kex->server_version_string,
-+		    buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
-+		    buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
++		    buffer_ptr(&ssh->kex->peer), buffer_len(&ssh->kex->peer),
++		    buffer_ptr(&ssh->kex->my), buffer_len(&ssh->kex->my),
 +		    NULL, 0, /* Change this if we start sending host keys */
 +		    dh_client_pub, dh->pub_key, shared_secret,
 +		    hash, &hashlen
@@ -1647,8 +1647,8 @@ diff -up openssh-6.8p1/kexgsss.c.gsskex openssh-6.8p1/kexgsss.c
 +		kexgex_hash(
 +		    ssh->kex->hash_alg,
 +		    ssh->kex->client_version_string, ssh->kex->server_version_string,
-+		    buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
-+		    buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
++		    buffer_ptr(&ssh->kex->peer), buffer_len(&ssh->kex->peer),
++		    buffer_ptr(&ssh->kex->my), buffer_len(&ssh->kex->my),
 +		    NULL, 0,
 +		    min, nbits, max,
 +		    dh->p, dh->g,