summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/ec.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/ec.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/ec.c')
-rw-r--r--src/usr.bin/openssl/ec.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/ec.c b/src/usr.bin/openssl/ec.c
index d5fe68f0d8..b4e2fe1daa 100644
--- a/src/usr.bin/openssl/ec.c
+++ b/src/usr.bin/openssl/ec.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec.c,v 1.5 2015/09/11 14:30:23 bcook Exp $ */ 1/* $OpenBSD: ec.c,v 1.6 2015/10/10 22:28:51 doug Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -277,6 +277,11 @@ ec_main(int argc, char **argv)
277 BIO *in = NULL, *out = NULL; 277 BIO *in = NULL, *out = NULL;
278 char *passin = NULL, *passout = NULL; 278 char *passin = NULL, *passout = NULL;
279 279
280 if (single_execution) {
281 if (pledge("stdio rpath wpath cpath", NULL) == -1)
282 perror("pledge");
283 }
284
280 memset(&ec_config, 0, sizeof(ec_config)); 285 memset(&ec_config, 0, sizeof(ec_config));
281 286
282 ec_config.asn1_flag = OPENSSL_EC_NAMED_CURVE; 287 ec_config.asn1_flag = OPENSSL_EC_NAMED_CURVE;