diff options
author | Damien Miller <djm@mindrot.org> | 2013-11-08 12:26:34 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-11-08 12:26:34 +1100 |
commit | 13cfd6d68237ef844dd8e02cf9ed21268154a999 (patch) | |
tree | 0f5d1c5bf0134fd5471e67bfc7b8982dc32ccb40 /monitor_wrap.c | |
parent | 4425e64da7dee0b3e81f1ae301f56fa3a83fe221 (diff) |
- markus@cvs.openbsd.org 2013/11/06 16:52:11
[monitor_wrap.c]
fix rekeying for AES-GCM modes; ok deraadt
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 88ff68330..4ce469605 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.76 2013/05/17 00:13:13 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.77 2013/11/06 16:52:11 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> |
@@ -482,7 +482,7 @@ mm_newkeys_from_blob(u_char *blob, int blen) | |||
482 | buffer_init(&b); | 482 | buffer_init(&b); |
483 | buffer_append(&b, blob, blen); | 483 | buffer_append(&b, blob, blen); |
484 | 484 | ||
485 | newkey = xmalloc(sizeof(*newkey)); | 485 | newkey = xcalloc(1, sizeof(*newkey)); |
486 | enc = &newkey->enc; | 486 | enc = &newkey->enc; |
487 | mac = &newkey->mac; | 487 | mac = &newkey->mac; |
488 | comp = &newkey->comp; | 488 | comp = &newkey->comp; |