summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/ecparam.c
diff options
context:
space:
mode:
authordoug <>2015-10-10 22:28:51 +0000
committerdoug <>2015-10-10 22:28:51 +0000
commit503cf2bd70538bb9cc734a5fd58230b90be4d1d8 (patch)
treea1bec6cdad41903b9c145025632c4b983a111465 /src/usr.bin/openssl/ecparam.c
parent2d9e1e812a55eea3d673b7734ac91bd087a9c7d8 (diff)
downloadopenbsd-503cf2bd70538bb9cc734a5fd58230b90be4d1d8.tar.gz
openbsd-503cf2bd70538bb9cc734a5fd58230b90be4d1d8.tar.bz2
openbsd-503cf2bd70538bb9cc734a5fd58230b90be4d1d8.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/ecparam.c')
-rw-r--r--src/usr.bin/openssl/ecparam.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/ecparam.c b/src/usr.bin/openssl/ecparam.c
index 6adac863d5..bd0c5b8cc0 100644
--- a/src/usr.bin/openssl/ecparam.c
+++ b/src/usr.bin/openssl/ecparam.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecparam.c,v 1.13 2015/09/11 14:30:23 bcook Exp $ */ 1/* $OpenBSD: ecparam.c,v 1.14 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 */
@@ -259,6 +259,11 @@ ecparam_main(int argc, char **argv)
259 BIO *in = NULL, *out = NULL; 259 BIO *in = NULL, *out = NULL;
260 int i, ret = 1; 260 int i, ret = 1;
261 261
262 if (single_execution) {
263 if (pledge("stdio rpath wpath cpath", NULL) == -1)
264 perror("pledge");
265 }
266
262 memset(&ecparam_config, 0, sizeof(ecparam_config)); 267 memset(&ecparam_config, 0, sizeof(ecparam_config));
263 ecparam_config.asn1_flag = OPENSSL_EC_NAMED_CURVE; 268 ecparam_config.asn1_flag = OPENSSL_EC_NAMED_CURVE;
264 ecparam_config.form = POINT_CONVERSION_UNCOMPRESSED; 269 ecparam_config.form = POINT_CONVERSION_UNCOMPRESSED;