diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-05-06 23:27:51 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-05-06 23:27:51 +0000 |
| commit | eef06e4f2a01ed326dde75376b5ab4da2225707a (patch) | |
| tree | 2c3eabe88c654200604ceae414886a3bb80b8f3b /usr.bin/signify/signify.c | |
| parent | 3501aeba85c00b86e462f360cc593975e2637ac6 (diff) | |
factor out the safepath
Diffstat (limited to 'usr.bin/signify/signify.c')
| -rw-r--r-- | usr.bin/signify/signify.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/signify/signify.c b/usr.bin/signify/signify.c index db4a455667e..35098421504 100644 --- a/usr.bin/signify/signify.c +++ b/usr.bin/signify/signify.c @@ -1,4 +1,4 @@ -/* $OpenBSD: signify.c,v 1.75 2014/05/06 23:24:19 tedu Exp $ */ +/* $OpenBSD: signify.c,v 1.76 2014/05/06 23:27:50 tedu Exp $ */ /* * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> * @@ -454,11 +454,12 @@ static void readpubkey(const char *pubkeyfile, struct pubkey *pubkey, const char *sigcomment) { + const char *safepath = "/etc/signify/"; if (!pubkeyfile) { if ((pubkeyfile = strstr(sigcomment, VERIFYWITH))) { pubkeyfile += strlen(VERIFYWITH); - if (strncmp(pubkeyfile, "/etc/signify/", 13) != 0 || + if (strncmp(pubkeyfile, safepath, strlen(safepath)) != 0 || strstr(pubkeyfile, "/../") != NULL) errx(1, "untrusted path %s", pubkeyfile); } else |