rpms/openssh
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Fix audit patch after rebase to 6.7

Browse Source
This commit is contained in:
Jakub Jelen 2015-01-27 11:41:18 +01:00
parent 9b4e25cce0
commit 021326a6ae
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openssh-6.7p1-audit.patch
View File

@ -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]);

3
openssh.spec
View File

@ -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