pool/openssh
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 227709 from network

Browse Source 
- Update openssh-6.5p1-audit4-kex_results.patch to ensure that
  we don't pass a NULL string to buffer_put_cstring. This happens
  when you have "Ciphers chacha20-poly1305@openssh.com" directive. (forwarded request 227423 from namtrac)

OBS-URL: https://build.opensuse.org/request/show/227709
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=94
This commit is contained in:
Stephan Kulow 2014-03-31 18:43:01 +00:00 committed by Git OBS Bridge
commit 0ea9e47b8b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openssh-6.5p1-audit4-kex_results.patch
View File

@ -699,9 +699,9 @@ diff --git a/openssh-6.5p1/monitor_wrap.c b/openssh-6.5p1/monitor_wrap.c
+ +
+ buffer_init(&m); + buffer_init(&m);
+ buffer_put_int(&m, ctos); + buffer_put_int(&m, ctos);
+ buffer_put_cstring(&m, cipher); + buffer_put_cstring(&m, cipher ? cipher : "");
+ buffer_put_cstring(&m, mac); + buffer_put_cstring(&m, mac ? mac : "");
+ buffer_put_cstring(&m, compress); + buffer_put_cstring(&m, compress ? compress : "");
+ buffer_put_int64(&m, pid); + buffer_put_int64(&m, pid);
+ buffer_put_int64(&m, uid); + buffer_put_int64(&m, uid);
+ +

7
openssh.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 25 10:07:18 UTC 2014 - idonmez@suse.com
- Update openssh-6.5p1-audit4-kex_results.patch to ensure that
we don't pass a NULL string to buffer_put_cstring. This happens
when you have "Ciphers chacha20-poly1305@openssh.com" directive.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 17 02:21:13 UTC 2014 - pcerny@suse.com Mon Mar 17 02:21:13 UTC 2014 - pcerny@suse.com