[openssh-commits] [openssh] 01/05: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit ddef9995a1fa6c7a8ff3b38bfe6cf724bebf13d0
Author: naddy at openbsd.org <naddy at openbsd.org>
Date:   Thu Jan 15 18:32:54 2015 +0000

    upstream commit
    
    handle UMAC128 initialization like UMAC; ok djm@ markus@
---
 mac.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 @@ mac_init(struct sshmac *mac)
 			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;

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.