diff options
| author | Damien Miller <djm@mindrot.org> | 2010-08-05 05:05:15 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-08-05 05:05:15 +0200 |
| commit | 5458c4dd138a4ca14ad5d1d1c2da9acff7d909d6 (patch) | |
| tree | 8bec7cf567e5860a1c751c135ffc94258b00b7f5 /authfile.c | |
| parent | - djm@cvs.openbsd.org 2010/08/04 05:42:47 (diff) | |
| download | openssh-5458c4dd138a4ca14ad5d1d1c2da9acff7d909d6.tar.xz openssh-5458c4dd138a4ca14ad5d1d1c2da9acff7d909d6.zip | |
- djm@cvs.openbsd.org 2010/08/04 05:49:22
[authfile.c]
commited the wrong version of the hostbased certificate diff; this
version replaces some strlc{py,at} verbosity with xasprintf() at
the request of markus@
Diffstat (limited to 'authfile.c')
| -rw-r--r-- | authfile.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/authfile.c b/authfile.c index 6bf41db9a..2bd887845 100644 --- a/authfile.c +++ b/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.81 2010/08/04 05:42:47 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.82 2010/08/04 05:49:22 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -698,13 +698,15 @@ Key * key_load_cert(const char *filename) { Key *pub; - char file[MAXPATHLEN]; + char *file; pub = key_new(KEY_UNSPEC); - if ((strlcpy(file, filename, sizeof file) < sizeof(file)) && - (strlcat(file, "-cert.pub", sizeof file) < sizeof(file)) && - (key_try_load_public(pub, file, NULL) == 1)) + xasprintf(&file, "%s-cert.pub", filename); + if (key_try_load_public(pub, file, NULL) == 1) { + xfree(file); return pub; + } + xfree(file); key_free(pub); return NULL; } |