summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/s_time.c
diff options
context:
space:
mode:
authordoug <>2015-10-10 22:28:51 +0000
committerdoug <>2015-10-10 22:28:51 +0000
commitedaaa7bf2f0b5ce874b24101100d02d3f3d0747f (patch)
treea1bec6cdad41903b9c145025632c4b983a111465 /src/usr.bin/openssl/s_time.c
parenta7ed9884b640e4bc924d95a4f6587d129a0228c6 (diff)
downloadopenbsd-edaaa7bf2f0b5ce874b24101100d02d3f3d0747f.tar.gz
openbsd-edaaa7bf2f0b5ce874b24101100d02d3f3d0747f.tar.bz2
openbsd-edaaa7bf2f0b5ce874b24101100d02d3f3d0747f.zip
Initial support for pledges in openssl(1) commands.
openssl(1) has two mechanisms for operating: either a single execution of one command (looking at argv[0] or argv[1]) or as an interactive session than may execute any number of commands. We already have a top level pledge that should cover all commands and that's what interactive mode must continue using. However, we can tighten up the pledges when only executing one command. This is an initial stab at support and may contain regressions. Most commands only need "stdio rpath wpath cpath". The pledges could be further restricted by evaluating the situation after parsing options. deraadt@ and beck@ are roughly fine with this approach.
Diffstat (limited to 'src/usr.bin/openssl/s_time.c')
-rw-r--r--src/usr.bin/openssl/s_time.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/s_time.c b/src/usr.bin/openssl/s_time.c
index c102726b7e..417ff81f3f 100644
--- a/src/usr.bin/openssl/s_time.c
+++ b/src/usr.bin/openssl/s_time.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s_time.c,v 1.12 2015/09/11 14:43:57 lteo Exp $ */ 1/* $OpenBSD: s_time.c,v 1.13 2015/10/10 22:28:51 doug Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -258,6 +258,11 @@ s_time_main(int argc, char **argv)
258 char buf[1024 * 8]; 258 char buf[1024 * 8];
259 int ver; 259 int ver;
260 260
261 if (single_execution) {
262 if (pledge("stdio inet rpath", NULL) == -1)
263 perror("pledge");
264 }
265
261 s_time_meth = SSLv23_client_method(); 266 s_time_meth = SSLv23_client_method();
262 267
263 verify_depth = 0; 268 verify_depth = 0;