RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-11 20:29:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2007/09/12 19:39:19

Browse Source 
[umac.c]
     use xmalloc() and xfree(); ok markus@ pvalchev@
This commit is contained in:
Damien Miller 2007-09-17 16:11:01 +10:00
parent 1235cd387e
commit 83e04f2023
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -49,6 +49,9 @@
[sshpty.c]
remove #if defined block not needed; ok markus@ dtucker@
NB. RCS ID sync only
- stevesk@cvs.openbsd.org 2007/09/12 19:39:19
[umac.c]
use xmalloc() and xfree(); ok markus@ pvalchev@
20070914
- (dtucker) [openbsd-compat/bsd-asprintf.c] Plug mem leak in error path.
@ -3246,4 +3249,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4753 2007/09/17 06:10:21 djm Exp $
$Id: ChangeLog,v 1.4754 2007/09/17 06:11:01 djm Exp $

7
umac.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: umac.c,v 1.1 2007/06/07 19:37:34 pvalchev Exp $ */
/* $OpenBSD: umac.c,v 1.2 2007/09/12 19:39:19 stevesk Exp $ */
/* -----------------------------------------------------------------------
*
* umac.c -- C Implementation UMAC Message Authentication
@ -66,6 +66,7 @@
#include "includes.h"
#include <sys/types.h>
#include "xmalloc.h"
#include "umac.h"
#include <string.h>
#include <stdlib.h>
@ -1196,7 +1197,7 @@ int umac_delete(struct umac_ctx *ctx)
if (ctx) {
if (ALLOC_BOUNDARY)
ctx = (struct umac_ctx *)ctx->free_ptr;
free(ctx);
xfree(ctx);
}
return (1);
}
@ -1212,7 +1213,7 @@ struct umac_ctx *umac_new(u_char key[])
size_t bytes_to_add;
aes_int_key prf_key;
octx = ctx = malloc(sizeof(*ctx) + ALLOC_BOUNDARY);
octx = ctx = xmalloc(sizeof(*ctx) + ALLOC_BOUNDARY);
if (ctx) {
if (ALLOC_BOUNDARY) {
bytes_to_add = ALLOC_BOUNDARY -