summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/ocsp.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/ocsp.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/ocsp.c')
-rw-r--r--src/usr.bin/openssl/ocsp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/ocsp.c b/src/usr.bin/openssl/ocsp.c
index 3a6ac36b1e..c3b1b168ba 100644
--- a/src/usr.bin/openssl/ocsp.c
+++ b/src/usr.bin/openssl/ocsp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp.c,v 1.5 2015/10/03 03:39:19 deraadt Exp $ */ 1/* $OpenBSD: ocsp.c,v 1.6 2015/10/10 22:28:51 doug Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -146,6 +146,11 @@ ocsp_main(int argc, char **argv)
146 const EVP_MD *cert_id_md = NULL; 146 const EVP_MD *cert_id_md = NULL;
147 const char *errstr = NULL; 147 const char *errstr = NULL;
148 148
149 if (single_execution) {
150 if (pledge("stdio inet rpath wpath cpath", NULL) == -1)
151 perror("pledge");
152 }
153
149 args = argv + 1; 154 args = argv + 1;
150 reqnames = sk_OPENSSL_STRING_new_null(); 155 reqnames = sk_OPENSSL_STRING_new_null();
151 ids = sk_OCSP_CERTID_new_null(); 156 ids = sk_OCSP_CERTID_new_null();