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

rebase audit patch for openssh-6.4p1

Browse Source
This commit is contained in:
Petr Lautrbach 2013-11-08 13:33:51 +01:00
parent 3ed6191f56
commit 27189b85ef
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openssh-6.3p1-audit.patch → openssh-6.4p1-audit.patch
View File

@ -1440,9 +1440,9 @@ diff -up openssh-6.3p1/monitor.h.audit openssh-6.3p1/monitor.h
}; };
diff -up openssh-6.3p1/monitor_wrap.c.audit openssh-6.3p1/monitor_wrap.c diff -up openssh-6.4p1/monitor_wrap.c.audit openssh-6.4p1/monitor_wrap.c
--- openssh-6.3p1/monitor_wrap.c.audit 2013-10-07 15:53:34.217717411 +0200 --- openssh-6.4p1/monitor_wrap.c.audit 2013-11-08 13:26:47.062595006 +0100
+++ openssh-6.3p1/monitor_wrap.c 2013-10-07 16:03:16.190993304 +0200 +++ openssh-6.4p1/monitor_wrap.c 2013-11-08 13:26:47.089594877 +0100
@@ -433,7 +433,7 @@ mm_key_allowed(enum mm_keytype type, cha @@ -433,7 +433,7 @@ mm_key_allowed(enum mm_keytype type, cha
*/ */
@ -1480,15 +1480,6 @@ diff -up openssh-6.3p1/monitor_wrap.c.audit openssh-6.3p1/monitor_wrap.c
/* Export key state after authentication */ /* Export key state after authentication */
Newkeys * Newkeys *
mm_newkeys_from_blob(u_char *blob, int blen) mm_newkeys_from_blob(u_char *blob, int blen)
@@ -482,7 +496,7 @@ mm_newkeys_from_blob(u_char *blob, int b
buffer_init(&b);
buffer_append(&b, blob, blen);
- newkey = xmalloc(sizeof(*newkey));
+ newkey = xcalloc(1, sizeof(*newkey));
enc = &newkey->enc;
mac = &newkey->mac;
comp = &newkey->comp;
@@ -642,12 +656,14 @@ mm_send_keystate(struct monitor *monitor @@ -642,12 +656,14 @@ mm_send_keystate(struct monitor *monitor
fatal("%s: conversion of newkeys failed", __func__); fatal("%s: conversion of newkeys failed", __func__);