commit ddef9995a1fa6c7a8ff3b38bfe6cf724bebf13d0
author naddy@openbsd.org <naddy@openbsd.org> Thu Jan 15 18:32:54 2015 +0000
committer Damien Miller <djm@mindrot.org> Fri Jan 16 18:21:32 2015 +1100
tree 9d28ba5828f81e21de7e4ea9280c0d9ce99413f5
parent f14564c1f7792446bca143580aef0e7ac25dcdae

upstream commit

handle UMAC128 initialization like UMAC; ok djm@ markus@

mac.c

diff --git a/mac.c b/mac.c
index 11c30a1..f63fbff 100644
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mac.c,v 1.31 2015/01/13 19:31:40 markus Exp $ */
+/* $OpenBSD: mac.c,v 1.32 2015/01/15 18:32:54 naddy Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -158,7 +158,8 @@
 			return SSH_ERR_ALLOC_FAIL;
 		return 0;
 	case SSH_UMAC128:
-		mac->umac_ctx = umac128_new(mac->key);
+		if ((mac->umac_ctx = umac128_new(mac->key)) == NULL)
+			return SSH_ERR_ALLOC_FAIL;
 		return 0;
 	default:
 		return SSH_ERR_INVALID_ARGUMENT;