diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-01-13 19:31:40 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-14 20:43:11 +1100 |
commit | 128343bcdb0b60fc826f2733df8cf979ec1627b4 (patch) | |
tree | ec2b30d15b28ee4e5f3822493989fad1e00199f6 /monitor_wrap.c | |
parent | e7fd952f4ea01f09ceb068721a5431ac2fd416ed (diff) |
upstream commit
adapt mac.c to ssherr.h return codes (de-fatal) and
simplify dependencies ok djm@
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index 45dc16951..f4e11c966 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.80 2014/04/29 18:01:49 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.81 2015/01/13 19:31:40 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -506,7 +506,7 @@ mm_newkeys_from_blob(u_char *blob, int blen) | |||
506 | /* Mac structure */ | 506 | /* Mac structure */ |
507 | if (cipher_authlen(enc->cipher) == 0) { | 507 | if (cipher_authlen(enc->cipher) == 0) { |
508 | mac->name = buffer_get_string(&b, NULL); | 508 | mac->name = buffer_get_string(&b, NULL); |
509 | if (mac->name == NULL || mac_setup(mac, mac->name) == -1) | 509 | if (mac->name == NULL || mac_setup(mac, mac->name) != 0) |
510 | fatal("%s: can not setup mac %s", __func__, mac->name); | 510 | fatal("%s: can not setup mac %s", __func__, mac->name); |
511 | mac->enabled = buffer_get_int(&b); | 511 | mac->enabled = buffer_get_int(&b); |
512 | mac->key = buffer_get_string(&b, &len); | 512 | mac->key = buffer_get_string(&b, &len); |