summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/dsaparam.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/dsaparam.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 '')
-rw-r--r--src/usr.bin/openssl/dsaparam.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/usr.bin/openssl/dsaparam.c b/src/usr.bin/openssl/dsaparam.c
index 0cdd5c1d51..73249498fc 100644
--- a/src/usr.bin/openssl/dsaparam.c
+++ b/src/usr.bin/openssl/dsaparam.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsaparam.c,v 1.5 2015/09/11 14:30:23 bcook Exp $ */ 1/* $OpenBSD: dsaparam.c,v 1.6 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 *
@@ -168,6 +168,11 @@ dsaparam_main(int argc, char **argv)
168 int numbits = -1; 168 int numbits = -1;
169 char *strbits = NULL; 169 char *strbits = NULL;
170 170
171 if (single_execution) {
172 if (pledge("stdio rpath wpath cpath", NULL) == -1)
173 perror("pledge");
174 }
175
171 memset(&dsaparam_config, 0, sizeof(dsaparam_config)); 176 memset(&dsaparam_config, 0, sizeof(dsaparam_config));
172 177
173 dsaparam_config.informat = FORMAT_PEM; 178 dsaparam_config.informat = FORMAT_PEM;