handle UMAC128 initialization like UMAC; ok djm@ markus@
authornaddy <naddy@openbsd.org>
Thu, 15 Jan 2015 18:32:54 +0000 (18:32 +0000)
committernaddy <naddy@openbsd.org>
Thu, 15 Jan 2015 18:32:54 +0000 (18:32 +0000)
usr.bin/ssh/mac.c

index 7572f17..b0b4362 100644 (file)
@@ -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.
  *
@@ -150,7 +150,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;