diff options
author | Damien Miller <djm@mindrot.org> | 2006-04-23 12:05:46 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-04-23 12:05:46 +1000 |
commit | 63e437f053bec9e227ba11e5e6205cd1e217baac (patch) | |
tree | f910de559e1371216947f027a88a9c164a16f40e /gss-genr.c | |
parent | 603e68f1a29c954f0c08a08b3f429956008ac244 (diff) |
- djm@cvs.openbsd.org 2006/04/03 07:10:38
[gss-genr.c]
GSSAPI buffers shouldn't be nul-terminated, spotted in bugzilla #1066
by dleonard AT vintela.com. use xasprintf() to simplify code while in
there; "looks right" deraadt@
Diffstat (limited to 'gss-genr.c')
-rw-r--r-- | gss-genr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gss-genr.c b/gss-genr.c index 4c10f1aab..3d630ab82 100644 --- a/gss-genr.c +++ b/gss-genr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-genr.c,v 1.9 2006/03/25 22:22:43 djm Exp $ */ | 1 | /* $OpenBSD: gss-genr.c,v 1.10 2006/04/03 07:10:38 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -205,10 +205,11 @@ OM_uint32 | |||
205 | ssh_gssapi_import_name(Gssctxt *ctx, const char *host) | 205 | ssh_gssapi_import_name(Gssctxt *ctx, const char *host) |
206 | { | 206 | { |
207 | gss_buffer_desc gssbuf; | 207 | gss_buffer_desc gssbuf; |
208 | char *val; | ||
208 | 209 | ||
209 | gssbuf.length = sizeof("host@") + strlen(host); | 210 | xasprintf(&val, "host@%s", host); |
210 | gssbuf.value = xmalloc(gssbuf.length); | 211 | gssbuf.value = val; |
211 | snprintf(gssbuf.value, gssbuf.length, "host@%s", host); | 212 | gssbuf.length = strlen(gssbuf.value); |
212 | 213 | ||
213 | if ((ctx->major = gss_import_name(&ctx->minor, | 214 | if ((ctx->major = gss_import_name(&ctx->minor, |
214 | &gssbuf, GSS_C_NT_HOSTBASED_SERVICE, &ctx->name))) | 215 | &gssbuf, GSS_C_NT_HOSTBASED_SERVICE, &ctx->name))) |