From f7227263017e95def75d80bf7079422eb82614b5ffba9a5ead5b98532b0e9961 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 27 Mar 2014 10:02:56 +0000 Subject: [PATCH] Accepting request 227423 from home:namtrac:bugfix - 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. OBS-URL: https://build.opensuse.org/request/show/227423 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=74 --- openssh-6.5p1-audit4-kex_results.patch | 6 +++--- openssh.changes | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/openssh-6.5p1-audit4-kex_results.patch b/openssh-6.5p1-audit4-kex_results.patch index e54b128..100f1ff 100644 --- a/openssh-6.5p1-audit4-kex_results.patch +++ b/openssh-6.5p1-audit4-kex_results.patch @@ -699,9 +699,9 @@ diff --git a/openssh-6.5p1/monitor_wrap.c b/openssh-6.5p1/monitor_wrap.c + + buffer_init(&m); + buffer_put_int(&m, ctos); -+ buffer_put_cstring(&m, cipher); -+ buffer_put_cstring(&m, mac); -+ buffer_put_cstring(&m, compress); ++ buffer_put_cstring(&m, cipher ? cipher : ""); ++ buffer_put_cstring(&m, mac ? mac : ""); ++ buffer_put_cstring(&m, compress ? compress : ""); + buffer_put_int64(&m, pid); + buffer_put_int64(&m, uid); + diff --git a/openssh.changes b/openssh.changes index 32fa829..f10b527 100644 --- a/openssh.changes +++ b/openssh.changes @@ -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