diff options
author | Damien Miller <djm@mindrot.org> | 2010-08-05 13:05:15 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-08-05 13:05:15 +1000 |
commit | 5458c4dd138a4ca14ad5d1d1c2da9acff7d909d6 (patch) | |
tree | 8bec7cf567e5860a1c751c135ffc94258b00b7f5 /authfile.c | |
parent | c158331f8c7e059c6c1d099bffc7f5fc6087ddbd (diff) |
- 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 @@ | |||
1 | /* $OpenBSD: authfile.c,v 1.81 2010/08/04 05:42:47 djm Exp $ */ | 1 | /* $OpenBSD: authfile.c,v 1.82 2010/08/04 05:49:22 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -698,13 +698,15 @@ Key * | |||
698 | key_load_cert(const char *filename) | 698 | key_load_cert(const char *filename) |
699 | { | 699 | { |
700 | Key *pub; | 700 | Key *pub; |
701 | char file[MAXPATHLEN]; | 701 | char *file; |
702 | 702 | ||
703 | pub = key_new(KEY_UNSPEC); | 703 | pub = key_new(KEY_UNSPEC); |
704 | if ((strlcpy(file, filename, sizeof file) < sizeof(file)) && | 704 | xasprintf(&file, "%s-cert.pub", filename); |
705 | (strlcat(file, "-cert.pub", sizeof file) < sizeof(file)) && | 705 | if (key_try_load_public(pub, file, NULL) == 1) { |
706 | (key_try_load_public(pub, file, NULL) == 1)) | 706 | xfree(file); |
707 | return pub; | 707 | return pub; |
708 | } | ||
709 | xfree(file); | ||
708 | key_free(pub); | 710 | key_free(pub); |
709 | return NULL; | 711 | return NULL; |
710 | } | 712 | } |