diff options
| author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:40:29 +0000 |
| commit | a25ec0b132c44c9e341e08464ff830de06b81126 (patch) | |
| tree | e20842d80f9e25cb6cf09525abea63f7bf655dd7 /monitor_wrap.c | |
| parent | 1b816ea846aca3ee89e7995373ace609e9518424 (diff) | |
| parent | 70847d299887abb96f8703ca99db6d817b78960e (diff) | |
import openssh-4.7p1-gsskex-20070927.patch
Diffstat (limited to 'monitor_wrap.c')
| -rw-r--r-- | monitor_wrap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index b0ced5ac7..eff912562 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: monitor_wrap.c,v 1.55 2007/02/19 10:45:58 dtucker Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.57 2007/06/07 19:37:34 pvalchev 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> |
| @@ -476,8 +476,8 @@ mm_newkeys_from_blob(u_char *blob, int blen) | |||
| 476 | 476 | ||
| 477 | /* Mac structure */ | 477 | /* Mac structure */ |
| 478 | mac->name = buffer_get_string(&b, NULL); | 478 | mac->name = buffer_get_string(&b, NULL); |
| 479 | if (mac->name == NULL || mac_init(mac, mac->name) == -1) | 479 | if (mac->name == NULL || mac_setup(mac, mac->name) == -1) |
| 480 | fatal("%s: can not init mac %s", __func__, mac->name); | 480 | fatal("%s: can not setup mac %s", __func__, mac->name); |
| 481 | mac->enabled = buffer_get_int(&b); | 481 | mac->enabled = buffer_get_int(&b); |
| 482 | mac->key = buffer_get_string(&b, &len); | 482 | mac->key = buffer_get_string(&b, &len); |
| 483 | if (len > mac->key_len) | 483 | if (len > mac->key_len) |