diff options
| author |   florian <florian@openbsd.org> | 2015-11-05 20:07:15 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2015-11-05 20:07:15 +0000 |
| commit | 81d54bdb24a2a3c1cc07ae0121629b46be8b6ae2 (patch) | |
| tree | afffb1171c90be6decbe06a1c1b584b3415f8b03 | |
| parent | explicitly say that we use uio for our crypto operations; ok mikeb@ (diff) | |
| download | wireguard-openbsd-81d54bdb24a2a3c1cc07ae0121629b46be8b6ae2.tar.xz wireguard-openbsd-81d54bdb24a2a3c1cc07ae0121629b46be8b6ae2.zip | |
Make our initial pledge stricter once we figured out in which mode we
are running.
In batch mode we are only reading from stdin and writing to stdout.
If no file is specified we are reading from stdin, writing to stdout
and need to control the tty for readpassphrase.
OK deraadt@ on an earlier version some time ago.
| -rw-r--r-- | usr.bin/htpasswd/htpasswd.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/htpasswd/htpasswd.c b/usr.bin/htpasswd/htpasswd.c index 7cd139c7b59..73683302343 100644 --- a/usr.bin/htpasswd/htpasswd.c +++ b/usr.bin/htpasswd/htpasswd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: htpasswd.c,v 1.14 2015/10/16 13:37:44 millert Exp $ */ +/* $OpenBSD: htpasswd.c,v 1.15 2015/11/05 20:07:15 florian Exp $ */ /* * Copyright (c) 2014 Florian Obser <florian@openbsd.org> * @@ -80,6 +80,9 @@ main(int argc, char** argv) file = argv[0]; else if (argc > 1) usage(); + else if (pledge("stdio", NULL) == -1) + err(1, "pledge"); + if ((linelen = getline(&line, &linesize, stdin)) == -1) err(1, "cannot read login:password from stdin"); line[linelen-1] = '\0'; @@ -97,6 +100,8 @@ main(int argc, char** argv) switch (argc) { case 1: + if (pledge("stdio tty", NULL) == -1) + err(1, "pledge"); if ((loginlen = asprintf(&login, "%s:", argv[0])) == -1) err(1, "asprintf"); break; |