===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/umac.c,v
retrieving revision 1.4.6.1
retrieving revision 1.5
diff -u -r1.4.6.1 -r1.5
--- src/usr.bin/ssh/umac.c	2013/11/08 05:52:21	1.4.6.1
+++ src/usr.bin/ssh/umac.c	2013/05/17 00:13:14	1.5
@@ -1,4 +1,4 @@
-/* $OpenBSD: umac.c,v 1.4.6.1 2013/11/08 05:52:21 djm Exp $ */
+/* $OpenBSD: umac.c,v 1.5 2013/05/17 00:13:14 djm Exp $ */
 /* -----------------------------------------------------------------------
  * 
  * umac.c -- C Implementation UMAC Message Authentication
@@ -1197,7 +1197,7 @@
     if (ctx) {
         if (ALLOC_BOUNDARY)
             ctx = (struct umac_ctx *)ctx->free_ptr;
-        xfree(ctx);
+        free(ctx);
     }
     return (1);
 }
@@ -1213,7 +1213,7 @@
     size_t bytes_to_add;
     aes_int_key prf_key;
     
-    octx = ctx = xcalloc(1, sizeof(*ctx) + ALLOC_BOUNDARY);
+    octx = ctx = xmalloc(sizeof(*ctx) + ALLOC_BOUNDARY);
     if (ctx) {
         if (ALLOC_BOUNDARY) {
             bytes_to_add = ALLOC_BOUNDARY -