summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/gss-genr.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2013-11-11 09:19:58 +0000
committerdelphij <delphij@FreeBSD.org>2013-11-11 09:19:58 +0000
commit454aa852775e6b588c94920bed615117c03b68e3 (patch)
treec4bbdc1d8ff81449a2f752ae23209759c2e18ab5 /crypto/openssh/gss-genr.c
parent5c6a9c13c5db23bbfd599dcc3dfd4da68e2a9266 (diff)
downloadFreeBSD-src-454aa852775e6b588c94920bed615117c03b68e3.zip
FreeBSD-src-454aa852775e6b588c94920bed615117c03b68e3.tar.gz
MFV r257952:
Upgrade to OpenSSH 6.4p1. Bump VersionAddendum. Approved by: des
Diffstat (limited to 'crypto/openssh/gss-genr.c')
-rw-r--r--crypto/openssh/gss-genr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/gss-genr.c b/crypto/openssh/gss-genr.c
index bf164a7..b39281b 100644
--- a/crypto/openssh/gss-genr.c
+++ b/crypto/openssh/gss-genr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-genr.c,v 1.21 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: gss-genr.c,v 1.22 2013/11/08 00:39:15 djm Exp $ */
/*
* Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
@@ -62,7 +62,7 @@ ssh_gssapi_set_oid_data(Gssctxt *ctx, void *data, size_t len)
free(ctx->oid->elements);
free(ctx->oid);
}
- ctx->oid = xmalloc(sizeof(gss_OID_desc));
+ ctx->oid = xcalloc(1, sizeof(gss_OID_desc));
ctx->oid->length = len;
ctx->oid->elements = xmalloc(len);
memcpy(ctx->oid->elements, data, len);
OpenPOWER on IntegriCloud