diff options
| author |   naddy <naddy@openbsd.org> | 2015-01-15 18:32:54 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2015-01-15 18:32:54 +0000 |
| commit | 5e4d3a2adf6d468d9a1d447b0551148374d8478f (patch) | |
| tree | f4f03384c2fb14a626f905e8aa35e9038eecc457 /usr.bin/ssh/mac.c | |
| parent | Fix subtle breakage for polled commands introduced during iopool conversion. (diff) | |
| download | wireguard-openbsd-5e4d3a2adf6d468d9a1d447b0551148374d8478f.tar.xz wireguard-openbsd-5e4d3a2adf6d468d9a1d447b0551148374d8478f.zip | |
handle UMAC128 initialization like UMAC; ok djm@ markus@
Diffstat (limited to 'usr.bin/ssh/mac.c')
| -rw-r--r-- | usr.bin/ssh/mac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/mac.c b/usr.bin/ssh/mac.c index 7572f17112b..b0b4362631f 100644 --- a/usr.bin/ssh/mac.c +++ b/usr.bin/ssh/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. * @@ -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; |