jonathan/openssh
1
0
Fork 0
forked from rpms/openssh
Code Pull Requests Activity

Revert "Fix buffer handling in GSS after rebase" (#1207719)

Browse Source 
This reverts commit d94cf27456.
This commit is contained in:
Jakub Jelen 2015-03-30 12:02:57 +02:00
parent 576cdf728b
commit d1bd586e93
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
openssh-6.6p1-gsskex.patch
View File

@ -1346,8 +1346,8 @@ diff -up openssh-6.8p1/kexgssc.c.gsskex openssh-6.8p1/kexgssc.c
+ case KEX_GSS_GRP14_SHA1: + case KEX_GSS_GRP14_SHA1:
+ kex_dh_hash( ssh->kex->client_version_string, + kex_dh_hash( ssh->kex->client_version_string,
+ ssh->kex->server_version_string, + ssh->kex->server_version_string,
+ buffer_ptr(&ssh->kex->my), buffer_len(&ssh->kex->my), + buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
+ buffer_ptr(&ssh->kex->peer), buffer_len(&ssh->kex->peer), + buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
+ (serverhostkey ? serverhostkey : empty), slen, + (serverhostkey ? serverhostkey : empty), slen,
+ dh->pub_key, /* e */ + dh->pub_key, /* e */
+ dh_server_pub, /* f */ + 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->hash_alg,
+ ssh->kex->client_version_string, + ssh->kex->client_version_string,
+ ssh->kex->server_version_string, + ssh->kex->server_version_string,
+ buffer_ptr(&ssh->kex->my), buffer_len(&ssh->kex->my), + buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
+ buffer_ptr(&ssh->kex->peer), buffer_len(&ssh->kex->peer), + buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
+ (serverhostkey ? serverhostkey : empty), slen, + (serverhostkey ? serverhostkey : empty), slen,
+ min, nbits, max, + min, nbits, max,
+ dh->p, dh->g, + 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: + case KEX_GSS_GRP14_SHA1:
+ kex_dh_hash( + kex_dh_hash(
+ ssh->kex->client_version_string, ssh->kex->server_version_string, + ssh->kex->client_version_string, ssh->kex->server_version_string,
+ buffer_ptr(&ssh->kex->peer), buffer_len(&ssh->kex->peer), + buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
+ buffer_ptr(&ssh->kex->my), buffer_len(&ssh->kex->my), + buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
+ NULL, 0, /* Change this if we start sending host keys */ + NULL, 0, /* Change this if we start sending host keys */
+ dh_client_pub, dh->pub_key, shared_secret, + dh_client_pub, dh->pub_key, shared_secret,
+ hash, &hashlen + hash, &hashlen
@ -1647,8 +1647,8 @@ diff -up openssh-6.8p1/kexgsss.c.gsskex openssh-6.8p1/kexgsss.c
+ kexgex_hash( + kexgex_hash(
+ ssh->kex->hash_alg, + ssh->kex->hash_alg,
+ ssh->kex->client_version_string, ssh->kex->server_version_string, + ssh->kex->client_version_string, ssh->kex->server_version_string,
+ buffer_ptr(&ssh->kex->peer), buffer_len(&ssh->kex->peer), + buffer_ptr(ssh->kex->peer), buffer_len(ssh->kex->peer),
+ buffer_ptr(&ssh->kex->my), buffer_len(&ssh->kex->my), + buffer_ptr(ssh->kex->my), buffer_len(ssh->kex->my),
+ NULL, 0, + NULL, 0,
+ min, nbits, max, + min, nbits, max,
+ dh->p, dh->g, + dh->p, dh->g,