summaryrefslogtreecommitdiff
path: root/gss-genr.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-11-09 14:02:03 +0000
committerColin Watson <cjwatson@debian.org>2013-11-09 14:02:03 +0000
commit35d1284f225e6b098a09b92afc01d17c73812e6b (patch)
tree4b41055057078716fe73a415d0c269a48d66ccf6 /gss-genr.c
parent327155e6824b3ee13837bdde04e4eb47e147ff46 (diff)
parent210ca37aa0cdf5499f0ea847ec150fefbfbf7c39 (diff)
* New upstream release (http://www.openssh.com/txt/release-6.4).
- sshd(8): fix a memory corruption problem triggered during rekeying when an AES-GCM cipher is selected (closes: #729029). Full details of the vulnerability are available at: http://www.openssh.com/txt/gcmrekey.adv
Diffstat (limited to 'gss-genr.c')
-rw-r--r--gss-genr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gss-genr.c b/gss-genr.c
index 3069347c2..b7d1b7dbf 100644
--- a/gss-genr.c
+++ b/gss-genr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: gss-genr.c,v 1.21 2013/05/17 00:13:13 djm Exp $ */ 1/* $OpenBSD: gss-genr.c,v 1.22 2013/11/08 00:39:15 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. 4 * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
@@ -217,7 +217,7 @@ ssh_gssapi_set_oid_data(Gssctxt *ctx, void *data, size_t len)
217 free(ctx->oid->elements); 217 free(ctx->oid->elements);
218 free(ctx->oid); 218 free(ctx->oid);
219 } 219 }
220 ctx->oid = xmalloc(sizeof(gss_OID_desc)); 220 ctx->oid = xcalloc(1, sizeof(gss_OID_desc));
221 ctx->oid->length = len; 221 ctx->oid->length = len;
222 ctx->oid->elements = xmalloc(len); 222 ctx->oid->elements = xmalloc(len);
223 memcpy(ctx->oid->elements, data, len); 223 memcpy(ctx->oid->elements, data, len);