summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/asn1pars.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/asn1pars.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/asn1pars.c')
-rw-r--r--src/usr.bin/openssl/asn1pars.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/asn1pars.c b/src/usr.bin/openssl/asn1pars.c
index da3bf761ce..2ce9d1a3ba 100644
--- a/src/usr.bin/openssl/asn1pars.c
+++ b/src/usr.bin/openssl/asn1pars.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1pars.c,v 1.4 2015/08/19 18:25:31 deraadt Exp $ */ 1/* $OpenBSD: asn1pars.c,v 1.5 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 *
@@ -247,6 +247,11 @@ asn1parse_main(int argc, char **argv)
247 BUF_MEM *buf = NULL; 247 BUF_MEM *buf = NULL;
248 ASN1_TYPE *at = NULL; 248 ASN1_TYPE *at = NULL;
249 249
250 if (single_execution) {
251 if (pledge("stdio rpath wpath cpath", NULL) == -1)
252 perror("pledge");
253 }
254
250 memset(&asn1pars_config, 0, sizeof(asn1pars_config)); 255 memset(&asn1pars_config, 0, sizeof(asn1pars_config));
251 256
252 asn1pars_config.informat = FORMAT_PEM; 257 asn1pars_config.informat = FORMAT_PEM;