From 021326a6aef944cd39b9f5a015e37b288a713c1a Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 27 Jan 2015 11:41:18 +0100 Subject: [PATCH] Fix audit patch after rebase to 6.7 --- openssh-6.7p1-audit.patch | 5 +++-- openssh.spec | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openssh-6.7p1-audit.patch b/openssh-6.7p1-audit.patch index 4ce4b53..b5c710b 100644 --- a/openssh-6.7p1-audit.patch +++ b/openssh-6.7p1-audit.patch @@ -1801,7 +1801,7 @@ index 9b7abd1..f1e00f7 100644 cipher_cleanup(cc); enc = &active_state->newkeys[mode]->enc; mac = &active_state->newkeys[mode]->mac; -@@ -2025,6 +2056,47 @@ packet_get_newkeys(int mode) +@@ -2025,6 +2056,48 @@ packet_get_newkeys(int mode) return (void *)active_state->newkeys[mode]; } @@ -1818,7 +1818,8 @@ index 9b7abd1..f1e00f7 100644 + buffer_free(&state->output); + buffer_free(&state->outgoing_packet); + buffer_free(&state->incoming_packet); -+ buffer_free(&state->compression_buffer); ++ if( state->compression_buffer_ready ) ++ buffer_free(&state->compression_buffer); + newkeys_destroy_and_free(state->newkeys[MODE_IN]); + state->newkeys[MODE_IN] = NULL; + newkeys_destroy_and_free(state->newkeys[MODE_OUT]); diff --git a/openssh.spec b/openssh.spec index fae66bf..231290c 100644 --- a/openssh.spec +++ b/openssh.spec @@ -430,8 +430,7 @@ popd %patch802 -p1 -b .GSSAPIEnablek5users %patch921 -p1 -b .tcp_wrappers -# FIXME: audit patch needs more love -# %patch200 -p1 -b .audit +%patch200 -p1 -b .audit %patch700 -p1 -b .fips # FIXME rebase 6.7p1