summaryrefslogtreecommitdiffstats
path: root/usr.bin/openssl/ecparam.c
diff options
context:
space:
mode:
authordoug <doug@openbsd.org>2015-10-10 22:28:51 +0000
committerdoug <doug@openbsd.org>2015-10-10 22:28:51 +0000
commit9bc487ad89cdc45a96f768a9aa951381839f53be (patch)
tree655e99110a43716e981586dbeadf6f04b67e9f0b /usr.bin/openssl/ecparam.c
parentpledge "stdio rpath wpath cpath fattr inet" after chroot and such (diff)
downloadwireguard-openbsd-9bc487ad89cdc45a96f768a9aa951381839f53be.tar.xz
wireguard-openbsd-9bc487ad89cdc45a96f768a9aa951381839f53be.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 'usr.bin/openssl/ecparam.c')
-rw-r--r--usr.bin/openssl/ecparam.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/openssl/ecparam.c b/usr.bin/openssl/ecparam.c
index 6adac863d5c..bd0c5b8cc0c 100644
--- a/usr.bin/openssl/ecparam.c
+++ b/usr.bin/openssl/ecparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecparam.c,v 1.13 2015/09/11 14:30:23 bcook Exp $ */
+/* $OpenBSD: ecparam.c,v 1.14 2015/10/10 22:28:51 doug Exp $ */
/*
* Written by Nils Larsch for the OpenSSL project.
*/
@@ -259,6 +259,11 @@ ecparam_main(int argc, char **argv)
BIO *in = NULL, *out = NULL;
int i, ret = 1;
+ if (single_execution) {
+ if (pledge("stdio rpath wpath cpath", NULL) == -1)
+ perror("pledge");
+ }
+
memset(&ecparam_config, 0, sizeof(ecparam_config));
ecparam_config.asn1_flag = OPENSSL_EC_NAMED_CURVE;
ecparam_config.form = POINT_CONVERSION_UNCOMPRESSED;